BKL: Remove BKL from JFS
The BKL is only used in put_super, fill_super and remount_fs that are all three protected by the superblocks s_umount rw_semaphore. Therefore it is safe to remove the BKL entirely. Signed-off-by: Jan Blunck <jblunck@infradead.org> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
parent
8526fb37c9
commit
22b26db6f8
|
@ -33,7 +33,6 @@
|
||||||
#include <linux/slab.h>
|
#include <linux/slab.h>
|
||||||
#include <asm/uaccess.h>
|
#include <asm/uaccess.h>
|
||||||
#include <linux/seq_file.h>
|
#include <linux/seq_file.h>
|
||||||
#include <linux/smp_lock.h>
|
|
||||||
|
|
||||||
#include "jfs_incore.h"
|
#include "jfs_incore.h"
|
||||||
#include "jfs_filsys.h"
|
#include "jfs_filsys.h"
|
||||||
|
@ -176,8 +175,6 @@ static void jfs_put_super(struct super_block *sb)
|
||||||
|
|
||||||
dquot_disable(sb, -1, DQUOT_USAGE_ENABLED | DQUOT_LIMITS_ENABLED);
|
dquot_disable(sb, -1, DQUOT_USAGE_ENABLED | DQUOT_LIMITS_ENABLED);
|
||||||
|
|
||||||
lock_kernel();
|
|
||||||
|
|
||||||
rc = jfs_umount(sb);
|
rc = jfs_umount(sb);
|
||||||
if (rc)
|
if (rc)
|
||||||
jfs_err("jfs_umount failed with return code %d", rc);
|
jfs_err("jfs_umount failed with return code %d", rc);
|
||||||
|
@ -188,8 +185,6 @@ static void jfs_put_super(struct super_block *sb)
|
||||||
iput(sbi->direct_inode);
|
iput(sbi->direct_inode);
|
||||||
|
|
||||||
kfree(sbi);
|
kfree(sbi);
|
||||||
|
|
||||||
unlock_kernel();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
enum {
|
enum {
|
||||||
|
@ -369,19 +364,16 @@ static int jfs_remount(struct super_block *sb, int *flags, char *data)
|
||||||
if (!parse_options(data, sb, &newLVSize, &flag)) {
|
if (!parse_options(data, sb, &newLVSize, &flag)) {
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
lock_kernel();
|
|
||||||
if (newLVSize) {
|
if (newLVSize) {
|
||||||
if (sb->s_flags & MS_RDONLY) {
|
if (sb->s_flags & MS_RDONLY) {
|
||||||
printk(KERN_ERR
|
printk(KERN_ERR
|
||||||
"JFS: resize requires volume to be mounted read-write\n");
|
"JFS: resize requires volume to be mounted read-write\n");
|
||||||
unlock_kernel();
|
|
||||||
return -EROFS;
|
return -EROFS;
|
||||||
}
|
}
|
||||||
rc = jfs_extendfs(sb, newLVSize, 0);
|
rc = jfs_extendfs(sb, newLVSize, 0);
|
||||||
if (rc) {
|
if (rc)
|
||||||
unlock_kernel();
|
|
||||||
return rc;
|
return rc;
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((sb->s_flags & MS_RDONLY) && !(*flags & MS_RDONLY)) {
|
if ((sb->s_flags & MS_RDONLY) && !(*flags & MS_RDONLY)) {
|
||||||
|
@ -397,36 +389,30 @@ static int jfs_remount(struct super_block *sb, int *flags, char *data)
|
||||||
/* mark the fs r/w for quota activity */
|
/* mark the fs r/w for quota activity */
|
||||||
sb->s_flags &= ~MS_RDONLY;
|
sb->s_flags &= ~MS_RDONLY;
|
||||||
|
|
||||||
unlock_kernel();
|
|
||||||
dquot_resume(sb, -1);
|
dquot_resume(sb, -1);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
if ((!(sb->s_flags & MS_RDONLY)) && (*flags & MS_RDONLY)) {
|
if ((!(sb->s_flags & MS_RDONLY)) && (*flags & MS_RDONLY)) {
|
||||||
rc = dquot_suspend(sb, -1);
|
rc = dquot_suspend(sb, -1);
|
||||||
if (rc < 0) {
|
if (rc < 0) {
|
||||||
unlock_kernel();
|
|
||||||
return rc;
|
return rc;
|
||||||
}
|
}
|
||||||
rc = jfs_umount_rw(sb);
|
rc = jfs_umount_rw(sb);
|
||||||
JFS_SBI(sb)->flag = flag;
|
JFS_SBI(sb)->flag = flag;
|
||||||
unlock_kernel();
|
|
||||||
return rc;
|
return rc;
|
||||||
}
|
}
|
||||||
if ((JFS_SBI(sb)->flag & JFS_NOINTEGRITY) != (flag & JFS_NOINTEGRITY))
|
if ((JFS_SBI(sb)->flag & JFS_NOINTEGRITY) != (flag & JFS_NOINTEGRITY))
|
||||||
if (!(sb->s_flags & MS_RDONLY)) {
|
if (!(sb->s_flags & MS_RDONLY)) {
|
||||||
rc = jfs_umount_rw(sb);
|
rc = jfs_umount_rw(sb);
|
||||||
if (rc) {
|
if (rc)
|
||||||
unlock_kernel();
|
|
||||||
return rc;
|
return rc;
|
||||||
}
|
|
||||||
JFS_SBI(sb)->flag = flag;
|
JFS_SBI(sb)->flag = flag;
|
||||||
ret = jfs_mount_rw(sb, 1);
|
ret = jfs_mount_rw(sb, 1);
|
||||||
unlock_kernel();
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
JFS_SBI(sb)->flag = flag;
|
JFS_SBI(sb)->flag = flag;
|
||||||
|
|
||||||
unlock_kernel();
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -438,20 +424,15 @@ static int jfs_fill_super(struct super_block *sb, void *data, int silent)
|
||||||
s64 newLVSize = 0;
|
s64 newLVSize = 0;
|
||||||
int flag, ret = -EINVAL;
|
int flag, ret = -EINVAL;
|
||||||
|
|
||||||
lock_kernel();
|
|
||||||
|
|
||||||
jfs_info("In jfs_read_super: s_flags=0x%lx", sb->s_flags);
|
jfs_info("In jfs_read_super: s_flags=0x%lx", sb->s_flags);
|
||||||
|
|
||||||
if (!new_valid_dev(sb->s_bdev->bd_dev)) {
|
if (!new_valid_dev(sb->s_bdev->bd_dev))
|
||||||
unlock_kernel();
|
|
||||||
return -EOVERFLOW;
|
return -EOVERFLOW;
|
||||||
}
|
|
||||||
|
|
||||||
sbi = kzalloc(sizeof (struct jfs_sb_info), GFP_KERNEL);
|
sbi = kzalloc(sizeof (struct jfs_sb_info), GFP_KERNEL);
|
||||||
if (!sbi) {
|
if (!sbi)
|
||||||
unlock_kernel();
|
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
}
|
|
||||||
sb->s_fs_info = sbi;
|
sb->s_fs_info = sbi;
|
||||||
sbi->sb = sb;
|
sbi->sb = sb;
|
||||||
sbi->uid = sbi->gid = sbi->umask = -1;
|
sbi->uid = sbi->gid = sbi->umask = -1;
|
||||||
|
@ -548,7 +529,6 @@ static int jfs_fill_super(struct super_block *sb, void *data, int silent)
|
||||||
sb->s_maxbytes = min(((u64) PAGE_CACHE_SIZE << 32) - 1, (u64)sb->s_maxbytes);
|
sb->s_maxbytes = min(((u64) PAGE_CACHE_SIZE << 32) - 1, (u64)sb->s_maxbytes);
|
||||||
#endif
|
#endif
|
||||||
sb->s_time_gran = 1;
|
sb->s_time_gran = 1;
|
||||||
unlock_kernel();
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
out_no_root:
|
out_no_root:
|
||||||
|
@ -571,7 +551,6 @@ out_unload:
|
||||||
unload_nls(sbi->nls_tab);
|
unload_nls(sbi->nls_tab);
|
||||||
out_kfree:
|
out_kfree:
|
||||||
kfree(sbi);
|
kfree(sbi);
|
||||||
unlock_kernel();
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue