Commit 96f287b0 authored by Trond Myklebust's avatar Trond Myklebust

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: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 22763c5c
...@@ -714,8 +714,6 @@ static void nfs_umount_begin(struct super_block *sb) ...@@ -714,8 +714,6 @@ static void nfs_umount_begin(struct super_block *sb)
struct nfs_server *server; struct nfs_server *server;
struct rpc_clnt *rpc; struct rpc_clnt *rpc;
lock_kernel();
server = NFS_SB(sb); server = NFS_SB(sb);
/* -EIO all pending I/O */ /* -EIO all pending I/O */
rpc = server->client_acl; rpc = server->client_acl;
...@@ -724,8 +722,6 @@ static void nfs_umount_begin(struct super_block *sb) ...@@ -724,8 +722,6 @@ static void nfs_umount_begin(struct super_block *sb)
rpc = server->client; rpc = server->client;
if (!IS_ERR(rpc)) if (!IS_ERR(rpc))
rpc_killall_tasks(rpc); rpc_killall_tasks(rpc);
unlock_kernel();
} }
static struct nfs_parsed_mount_data *nfs_alloc_parsed_mount_data(unsigned int version) static 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,7 +1877,6 @@ nfs_remount(struct super_block *sb, int *flags, char *raw_data)
if (data == NULL) if (data == NULL)
return -ENOMEM; return -ENOMEM;
lock_kernel();
/* fill out struct with values from existing mount */ /* fill out struct with values from existing mount */
data->flags = nfss->flags; data->flags = nfss->flags;
data->rsize = nfss->rsize; data->rsize = nfss->rsize;
...@@ -1907,7 +1902,6 @@ nfs_remount(struct super_block *sb, int *flags, char *raw_data) ...@@ -1907,7 +1902,6 @@ nfs_remount(struct super_block *sb, int *flags, char *raw_data)
error = nfs_compare_remount_data(nfss, data); error = nfs_compare_remount_data(nfss, data);
out: out:
kfree(data); kfree(data);
unlock_kernel();
return error; return error;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment