Part 4/11
do_remount_sb() placed under the exclusive lock on ->s_umount. All it takes
is replacement of fsync_dev() with fsync_super(). Callers updated.
diff -urN S9-pre3-get_sb_bdev2/fs/super.c S9-pre3-do_remount_sb/fs/super.c
--- S9-pre3-get_sb_bdev2/fs/super.c Mon Aug 13 21:21:26 2001
+++ S9-pre3-do_remount_sb/fs/super.c Mon Aug 13 21:21:27 2001
@@ -1035,8 +1035,8 @@
if (!sb)
BUG();
atomic_inc(&sb->s_active);
- do_remount_sb(sb, flags, data);
down_write(&sb->s_umount);
+ do_remount_sb(sb, flags, data);
return sb;
}
@@ -1107,7 +1107,7 @@
if (flags & MS_RDONLY)
acct_auto_close(sb->s_dev);
shrink_dcache_sb(sb);
- fsync_dev(sb->s_dev);
+ fsync_super(sb);
/* If we are remounting RDONLY, make sure there are no rw files open */
if ((flags & MS_RDONLY) && !(sb->s_flags & MS_RDONLY))
if (!fs_may_remount_ro(sb))
@@ -1192,8 +1192,11 @@
* Special case for "unmounting" root ...
* we just try to remount it readonly.
*/
- if (!(sb->s_flags & MS_RDONLY))
+ if (!(sb->s_flags & MS_RDONLY)) {
+ down_write(&sb->s_umount);
retval = do_remount_sb(sb, MS_RDONLY, 0);
+ up_write(&sb->s_umount);
+ }
return retval;
}
@@ -1369,13 +1372,19 @@
static int do_remount(struct nameidata *nd, int flags, char *data)
{
+ int err;
+ struct super_block * sb = nd->mnt->mnt_sb;
+
if (!capable(CAP_SYS_ADMIN))
return -EPERM;
if (nd->dentry != nd->mnt->mnt_root)
return -EINVAL;
- return do_remount_sb(nd->mnt->mnt_sb, flags, data);
+ down_write(&sb->s_umount);
+ err = do_remount_sb(sb, flags, data);
+ up_write(&sb->s_umount);
+ return err;
}
static int do_add_mount(struct nameidata *nd, char *type, int flags,
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Wed Aug 15 2001 - 21:00:49 EST