diff options
| author | Linus Torvalds | 2024-09-23 10:49:28 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2024-09-23 10:49:28 -0700 |
| commit | d0359e4ca0f26aaf3118124dfb562e3b3dca1c06 (patch) | |
| tree | aaca20240d891872d7f2bb698b51caa6b825071d /fs/ocfs2 | |
| parent | b3f391fddf3cfaadda59ec8da8fd17f4520bbf42 (diff) | |
| parent | 116249b12939a8ec13eb50f36b6fffd1c719a9ed (diff) | |
Merge tag 'fs_for_v6.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
Pull quota and isofs updates from Jan Kara:
"A few small cleanups in quota and isofs"
* tag 'fs_for_v6.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
isofs: Annotate struct SL_component with __counted_by()
quota: remove unnecessary error code translation in dquot_quota_enable
quota: remove redundant return at end of void function
quota: remove unneeded return value of register_quota_format
quota: avoid missing put_quota_format when DQUOT_SUSPENDED is passed
Diffstat (limited to 'fs/ocfs2')
| -rw-r--r-- | fs/ocfs2/super.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c index b704983b2112..3d404624bb96 100644 --- a/fs/ocfs2/super.c +++ b/fs/ocfs2/super.c @@ -1571,15 +1571,13 @@ static int __init ocfs2_init(void) ocfs2_set_locking_protocol(); - status = register_quota_format(&ocfs2_quota_format); - if (status < 0) - goto out3; + register_quota_format(&ocfs2_quota_format); + status = register_filesystem(&ocfs2_fs_type); if (!status) return 0; unregister_quota_format(&ocfs2_quota_format); -out3: debugfs_remove(ocfs2_debugfs_root); ocfs2_free_mem_caches(); out2: |