aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Kara <jack@suse.cz>2010-10-20 16:22:57 -0400
committerJan Kara <jack@suse.cz>2011-01-06 11:03:55 -0500
commit0484b1cedc053cf88a046da5f08bc00747e533cb (patch)
tree2847245e7ff7d0053ccbf65c9e6c07794b439fe4
parentc03cad241af63445b751781a09faf08b3a5b77c1 (diff)
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>
-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)
567 if (!udf_parse_options(options, &uopt, true)) 567 if (!udf_parse_options(options, &uopt, true))
568 return -EINVAL; 568 return -EINVAL;
569 569
570 lock_kernel();
571 write_lock(&sbi->s_cred_lock); 570 write_lock(&sbi->s_cred_lock);
572 sbi->s_flags = uopt.flags; 571 sbi->s_flags = uopt.flags;
573 sbi->s_uid = uopt.uid; 572 sbi->s_uid = uopt.uid;
@@ -592,7 +591,6 @@ static int udf_remount_fs(struct super_block *sb, int *flags, char *options)
592 udf_open_lvid(sb); 591 udf_open_lvid(sb);
593 592
594out_unlock: 593out_unlock:
595 unlock_kernel();
596 return error; 594 return error;
597} 595}
598 596
@@ -2132,8 +2130,6 @@ static void udf_put_super(struct super_block *sb)
2132 2130
2133 sbi = UDF_SB(sb); 2131 sbi = UDF_SB(sb);
2134 2132
2135 lock_kernel();
2136
2137 if (sbi->s_vat_inode) 2133 if (sbi->s_vat_inode)
2138 iput(sbi->s_vat_inode); 2134 iput(sbi->s_vat_inode);
2139 if (sbi->s_partitions) 2135 if (sbi->s_partitions)
@@ -2149,8 +2145,6 @@ static void udf_put_super(struct super_block *sb)
2149 kfree(sbi->s_partmaps); 2145 kfree(sbi->s_partmaps);
2150 kfree(sb->s_fs_info); 2146 kfree(sb->s_fs_info);
2151 sb->s_fs_info = NULL; 2147 sb->s_fs_info = NULL;
2152
2153 unlock_kernel();
2154} 2148}
2155 2149
2156static int udf_sync_fs(struct super_block *sb, int wait) 2150static int udf_sync_fs(struct super_block *sb, int wait)