diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-09-23 10:49:28 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-09-23 10:49:28 -0700 |
| commit | d0359e4ca0f26aaf3118124dfb562e3b3dca1c06 (patch) | |
| tree | aaca20240d891872d7f2bb698b51caa6b825071d /mm | |
| 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 'mm')
| -rw-r--r-- | mm/shmem.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/mm/shmem.c b/mm/shmem.c index 6eff8771d9cb..4f11b5506363 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -4961,11 +4961,7 @@ void __init shmem_init(void) shmem_init_inodecache(); #ifdef CONFIG_TMPFS_QUOTA - error = register_quota_format(&shmem_quota_format); - if (error < 0) { - pr_err("Could not register quota format\n"); - goto out3; - } + register_quota_format(&shmem_quota_format); #endif error = register_filesystem(&shmem_fs_type); @@ -5000,7 +4996,6 @@ out1: out2: #ifdef CONFIG_TMPFS_QUOTA unregister_quota_format(&shmem_quota_format); -out3: #endif shmem_destroy_inodecache(); shm_mnt = ERR_PTR(error); |