aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2009-12-03 08:09:56 -0500
committerTrond Myklebust <Trond.Myklebust@netapp.com>2009-12-03 08:09:56 -0500
commit96f287b0cf512ee537826943c15b0b8647472f70 (patch)
tree41ee4d27b988d3f2ba708c31451859e3c8ffca42 /fs
parent22763c5cf3690a681551162c15d34d935308c8d7 (diff)
NFS: BKL removal from the mount code...
None of the code in nfs_umount_begin() or nfs_remount() has any BKL dependency. Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/nfs/super.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index 90be551b80c1..f0188eaf3726 100644
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -714,8 +714,6 @@ static void nfs_umount_begin(struct super_block *sb)
714 struct nfs_server *server; 714 struct nfs_server *server;
715 struct rpc_clnt *rpc; 715 struct rpc_clnt *rpc;
716 716
717 lock_kernel();
718
719 server = NFS_SB(sb); 717 server = NFS_SB(sb);
720 /* -EIO all pending I/O */ 718 /* -EIO all pending I/O */
721 rpc = server->client_acl; 719 rpc = server->client_acl;
@@ -724,8 +722,6 @@ static void nfs_umount_begin(struct super_block *sb)
724 rpc = server->client; 722 rpc = server->client;
725 if (!IS_ERR(rpc)) 723 if (!IS_ERR(rpc))
726 rpc_killall_tasks(rpc); 724 rpc_killall_tasks(rpc);
727
728 unlock_kernel();
729} 725}
730 726
731static struct nfs_parsed_mount_data *nfs_alloc_parsed_mount_data(unsigned int version) 727static struct nfs_parsed_mount_data *nfs_alloc_parsed_mount_data(unsigned int version)
@@ -1881,7 +1877,6 @@ nfs_remount(struct super_block *sb, int *flags, char *raw_data)
1881 if (data == NULL) 1877 if (data == NULL)
1882 return -ENOMEM; 1878 return -ENOMEM;
1883 1879
1884 lock_kernel();
1885 /* fill out struct with values from existing mount */ 1880 /* fill out struct with values from existing mount */
1886 data->flags = nfss->flags; 1881 data->flags = nfss->flags;
1887 data->rsize = nfss->rsize; 1882 data->rsize = nfss->rsize;
@@ -1907,7 +1902,6 @@ nfs_remount(struct super_block *sb, int *flags, char *raw_data)
1907 error = nfs_compare_remount_data(nfss, data); 1902 error = nfs_compare_remount_data(nfss, data);
1908out: 1903out:
1909 kfree(data); 1904 kfree(data);
1910 unlock_kernel();
1911 return error; 1905 return error;
1912} 1906}
1913 1907