diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2009-05-06 10:43:07 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2009-06-11 21:36:08 -0400 |
commit | bbd6851a3213a525128473e978b692ab6ac11aba (patch) | |
tree | 8ebddebadd8992871ab98456187cb00849a82058 /fs/hpfs/super.c | |
parent | 6cfd0148425e528b859b26e436b01f23f6926224 (diff) |
Push lock_super() into the ->remount_fs() of filesystems that care about it
Note that since we can't run into contention between remount_fs and write_super
(due to exclusion on s_umount), we have to care only about filesystems that
touch lock_super() on their own. Out of those ext3, ext4, hpfs, sysv and ufs
do need it; fat doesn't since its ->remount_fs() only accesses assign-once
data (basically, it's "we have no atime on directories and only have atime on
files for vfat; force nodiratime and possibly noatime into *flags").
[folded a build fix from hch]
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/hpfs/super.c')
-rw-r--r-- | fs/hpfs/super.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/hpfs/super.c b/fs/hpfs/super.c index 437a32e9dea..f68193cf081 100644 --- a/fs/hpfs/super.c +++ b/fs/hpfs/super.c | |||
@@ -398,6 +398,7 @@ static int hpfs_remount_fs(struct super_block *s, int *flags, char *data) | |||
398 | 398 | ||
399 | *flags |= MS_NOATIME; | 399 | *flags |= MS_NOATIME; |
400 | 400 | ||
401 | lock_super(s); | ||
401 | uid = sbi->sb_uid; gid = sbi->sb_gid; | 402 | uid = sbi->sb_uid; gid = sbi->sb_gid; |
402 | umask = 0777 & ~sbi->sb_mode; | 403 | umask = 0777 & ~sbi->sb_mode; |
403 | lowercase = sbi->sb_lowercase; conv = sbi->sb_conv; | 404 | lowercase = sbi->sb_lowercase; conv = sbi->sb_conv; |
@@ -430,9 +431,11 @@ static int hpfs_remount_fs(struct super_block *s, int *flags, char *data) | |||
430 | 431 | ||
431 | replace_mount_options(s, new_opts); | 432 | replace_mount_options(s, new_opts); |
432 | 433 | ||
434 | unlock_super(s); | ||
433 | return 0; | 435 | return 0; |
434 | 436 | ||
435 | out_err: | 437 | out_err: |
438 | unlock_super(s); | ||
436 | kfree(new_opts); | 439 | kfree(new_opts); |
437 | return -EINVAL; | 440 | return -EINVAL; |
438 | } | 441 | } |