diff --git a/[refs] b/[refs] index 21437a817ea5..fdec3f50a066 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a4d05d315a4fdf5ccb0dbf0ce38bac12d522d33e +refs/heads/master: eee458936b52bd3a9ff0ff577313b637905fff08 diff --git a/trunk/fs/sysv/inode.c b/trunk/fs/sysv/inode.c index af13d1342f23..f20ffe32b398 100644 --- a/trunk/fs/sysv/inode.c +++ b/trunk/fs/sysv/inode.c @@ -68,12 +68,9 @@ static void sysv_write_super(struct super_block *sb) static int sysv_remount(struct super_block *sb, int *flags, char *data) { struct sysv_sb_info *sbi = SYSV_SB(sb); - lock_super(sb); + if (sbi->s_forced_ro) *flags |= MS_RDONLY; - if (*flags & MS_RDONLY) - sysv_write_super(sb); - unlock_super(sb); return 0; }