|
@@ -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)
|
|
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)
|
|
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)
|
|
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;
|
|
}
|
|
}
|
|
|
|
|