summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorJan Kara <jack@suse.cz>2010-10-20 22:22:57 +0200
committerJan Kara <jack@suse.cz>2011-01-06 17:03:55 +0100
commit0484b1cedc053cf88a046da5f08bc00747e533cb (patch)
tree2847245e7ff7d0053ccbf65c9e6c07794b439fe4 /fs
parentc03cad241af63445b751781a09faf08b3a5b77c1 (diff)
downloadlinux-0484b1cedc053cf88a046da5f08bc00747e533cb.tar.bz2
udf: Remove BKL from udf_put_super() and udf_remount_fs()
udf_put_super() does not need BKL because the filesystem is shut down so there's nothing to race with. The credential changes in udf_remount_fs() and LVID changes are now protected by dedicated locks so we can remove BKL from this function as well. Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs')
-rw-r--r--fs/udf/super.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/fs/udf/super.c b/fs/udf/super.c
index f06cc67cf864..4cf6121ab41a 100644
--- a/fs/udf/super.c
+++ b/fs/udf/super.c
@@ -567,7 +567,6 @@ static int udf_remount_fs(struct super_block *sb, int *flags, char *options)
if (!udf_parse_options(options, &uopt, true))
return -EINVAL;
- lock_kernel();
write_lock(&sbi->s_cred_lock);
sbi->s_flags = uopt.flags;
sbi->s_uid = uopt.uid;
@@ -592,7 +591,6 @@ static int udf_remount_fs(struct super_block *sb, int *flags, char *options)
udf_open_lvid(sb);
out_unlock:
- unlock_kernel();
return error;
}
@@ -2132,8 +2130,6 @@ static void udf_put_super(struct super_block *sb)
sbi = UDF_SB(sb);
- lock_kernel();
-
if (sbi->s_vat_inode)
iput(sbi->s_vat_inode);
if (sbi->s_partitions)
@@ -2149,8 +2145,6 @@ static void udf_put_super(struct super_block *sb)
kfree(sbi->s_partmaps);
kfree(sb->s_fs_info);
sb->s_fs_info = NULL;
-
- unlock_kernel();
}
static int udf_sync_fs(struct super_block *sb, int wait)