From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 22 Oct 2010 17:52:01 +0000 (-0700)
Subject: Merge branch 'vfs' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl
X-Git-Tag: firefly_0821_release~7613^2~3697
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=79f14b7c56d3b3ba58f8b43d1f70b9b71477a800;p=firefly-linux-kernel-4.4.55.git

Merge branch 'vfs' of git://git./linux/kernel/git/arnd/bkl

* 'vfs' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl: (30 commits)
  BKL: remove BKL from freevxfs
  BKL: remove BKL from qnx4
  autofs4: Only declare function when CONFIG_COMPAT is defined
  autofs: Only declare function when CONFIG_COMPAT is defined
  ncpfs: Lock socket in ncpfs while setting its callbacks
  fs/locks.c: prepare for BKL removal
  BKL: Remove BKL from ncpfs
  BKL: Remove BKL from OCFS2
  BKL: Remove BKL from squashfs
  BKL: Remove BKL from jffs2
  BKL: Remove BKL from ecryptfs
  BKL: Remove BKL from afs
  BKL: Remove BKL from USB gadgetfs
  BKL: Remove BKL from autofs4
  BKL: Remove BKL from isofs
  BKL: Remove BKL from fat
  BKL: Remove BKL from ext2 filesystem
  BKL: Remove BKL from do_new_mount()
  BKL: Remove BKL from cgroup
  BKL: Remove BKL from NTFS
  ...
---

79f14b7c56d3b3ba58f8b43d1f70b9b71477a800
diff --cc fs/ocfs2/super.c
index a8a0ca44f88f,b7d724393b5a..56f0cb395820
--- a/fs/ocfs2/super.c
+++ b/fs/ocfs2/super.c
@@@ -628,10 -608,7 +628,8 @@@ static int ocfs2_remount(struct super_b
  	int ret = 0;
  	struct mount_options parsed_options;
  	struct ocfs2_super *osb = OCFS2_SB(sb);
 +	u32 tmp;
  
- 	lock_kernel();
- 
  	if (!ocfs2_parse_options(sb, data, &parsed_options, 1) ||
  	    !ocfs2_check_set_options(sb, &parsed_options)) {
  		ret = -EINVAL;