Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
  get rid of BKL in fs/sysv
  get rid of BKL in fs/minix
  get rid of BKL in fs/efs
  befs ->pust_super() doesn't need BKL
  Cleanup of adfs headers
  9P doesn't need BKL in ->umount_begin()
  fuse doesn't need BKL in ->umount_begin()
  No instance of ->bmap() needs BKL
  remove unlock_kernel() left accidentally
  ext4: avoid unnecessary spinlock in critical POSIX ACL path
  ext3: avoid unnecessary spinlock in critical POSIX ACL path

1 files changed, 3 insertions, 9 deletions

diff --git a/fs/super.c b/fs/super.c
index 83b47416d006..d40d53a22fb5 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)