Re: [git pull] vfs patches, part 1

[hooanon05]

Al Viro:
> * more pushing of lock_super() and BKL down into fs (by now only ->get_sb()
>   has the latter held by caller and nothing in VFS touches the former) (me,
>   hch, Alessio Igor Bogani)
	:::
> Al Viro (36):
	:::
>       Push BKL down into do_remount_sb()
	:::
> Alessio Igor Bogani (1):
>       Push BKL down into ->remount_fs()

These two patches conflict, or are unmatched.
Al's patch adds one lock_kernel() call and several unlock_kernel() into
do_remount_sb(), and then Alessio's patch removes only single pair of
lock/unlock_kernel().
Finally a few unlock_kernel() are left in do_remount_sb().

I guess Alessio's base was different from Al's.


J. R. Okajima

commit 8219ce0904f57cd0893092369fbde39471cfb5a7
Author: J. R. Okajima <hooanon05@xxxxxxxxxxx>
Date:   Wed Jun 17 01:16:50 2009 +0900

    remove unlock_kernel() left accidentally
    
    commit 337eb00a2c3a421999c39c94ce7e33545ee8baa7
    Push BKL down into ->remount_fs()
    and
    commit 4aa98cf768b6f2ea4b204620d949a665959214f6
    Push BKL down into do_remount_sb()
    
    were uncorrectly merged.
    The former removes one pair of lock/unlock_kernel(), but the latter adds
    several unlock_kernel(). Finally a few unlock_kernel() calls left.
    
    Signed-off-by: J. R. Okajima <hooanon05@xxxxxxxxxxx>

diff --git a/fs/super.c b/fs/super.c
index 83b4741..d40d53a 100644
--- a/fs/super.c
+++ b/fs/super.c
@@ -545,24 +545,18 @@ int do_remount_sb(struct super_block *sb, int flags, void *data, int force)
 	if ((flags & MS_RDONLY) && !(sb->s_flags & MS_RDONLY)) {
 		if (force)
 			mark_files_ro(sb);
-		else if (!fs_may_remount_ro(sb)) {
-			unlock_kernel();
+		else if (!fs_may_remount_ro(sb))
 			return -EBUSY;
-		}
 		retval = vfs_dq_off(sb, 1);
-		if (retval < 0 && retval != -ENOSYS) {
-			unlock_kernel();
+		if (retval < 0 && retval != -ENOSYS)
 			return -EBUSY;
-		}
 	}
 	remount_rw = !(flags & MS_RDONLY) && (sb->s_flags & MS_RDONLY);
 
 	if (sb->s_op->remount_fs) {
 		retval = sb->s_op->remount_fs(sb, &flags, data);
-		if (retval) {
-			unlock_kernel();
+		if (retval)
 			return retval;
-		}
 	}
 	sb->s_flags = (sb->s_flags & ~MS_RMT_MASK) | (flags & MS_RMT_MASK);
 	if (remount_rw)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/