aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/nfs/direct.c6
-rw-r--r--fs/nfs/read.c2
-rw-r--r--fs/nfs/write.c2
3 files changed, 0 insertions, 10 deletions
diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c
index bdfabf854a5..784bbb54e6c 100644
--- a/fs/nfs/direct.c
+++ b/fs/nfs/direct.c
@@ -307,9 +307,7 @@ static ssize_t nfs_direct_read_schedule(struct nfs_direct_req *dreq, unsigned lo
307 307
308 data->task.tk_cookie = (unsigned long) inode; 308 data->task.tk_cookie = (unsigned long) inode;
309 309
310 lock_kernel();
311 rpc_execute(&data->task); 310 rpc_execute(&data->task);
312 unlock_kernel();
313 311
314 dfprintk(VFS, "NFS: %5u initiated direct read call (req %s/%Ld, %zu bytes @ offset %Lu)\n", 312 dfprintk(VFS, "NFS: %5u initiated direct read call (req %s/%Ld, %zu bytes @ offset %Lu)\n",
315 data->task.tk_pid, 313 data->task.tk_pid,
@@ -475,9 +473,7 @@ static void nfs_direct_commit_schedule(struct nfs_direct_req *dreq)
475 473
476 dprintk("NFS: %5u initiated commit call\n", data->task.tk_pid); 474 dprintk("NFS: %5u initiated commit call\n", data->task.tk_pid);
477 475
478 lock_kernel();
479 rpc_execute(&data->task); 476 rpc_execute(&data->task);
480 unlock_kernel();
481} 477}
482 478
483static void nfs_direct_write_complete(struct nfs_direct_req *dreq, struct inode *inode) 479static void nfs_direct_write_complete(struct nfs_direct_req *dreq, struct inode *inode)
@@ -641,9 +637,7 @@ static ssize_t nfs_direct_write_schedule(struct nfs_direct_req *dreq, unsigned l
641 data->task.tk_priority = RPC_PRIORITY_NORMAL; 637 data->task.tk_priority = RPC_PRIORITY_NORMAL;
642 data->task.tk_cookie = (unsigned long) inode; 638 data->task.tk_cookie = (unsigned long) inode;
643 639
644 lock_kernel();
645 rpc_execute(&data->task); 640 rpc_execute(&data->task);
646 unlock_kernel();
647 641
648 dfprintk(VFS, "NFS: %5u initiated direct write call (req %s/%Ld, %zu bytes @ offset %Lu)\n", 642 dfprintk(VFS, "NFS: %5u initiated direct write call (req %s/%Ld, %zu bytes @ offset %Lu)\n",
649 data->task.tk_pid, 643 data->task.tk_pid,
diff --git a/fs/nfs/read.c b/fs/nfs/read.c
index 29094a54508..cca9fa25999 100644
--- a/fs/nfs/read.c
+++ b/fs/nfs/read.c
@@ -323,9 +323,7 @@ static void nfs_execute_read(struct nfs_read_data *data)
323 sigset_t oldset; 323 sigset_t oldset;
324 324
325 rpc_clnt_sigmask(clnt, &oldset); 325 rpc_clnt_sigmask(clnt, &oldset);
326 lock_kernel();
327 rpc_execute(&data->task); 326 rpc_execute(&data->task);
328 unlock_kernel();
329 rpc_clnt_sigunmask(clnt, &oldset); 327 rpc_clnt_sigunmask(clnt, &oldset);
330} 328}
331 329
diff --git a/fs/nfs/write.c b/fs/nfs/write.c
index 9b8eb9373ad..4948dc1fbd7 100644
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
@@ -991,9 +991,7 @@ static void nfs_execute_write(struct nfs_write_data *data)
991 sigset_t oldset; 991 sigset_t oldset;
992 992
993 rpc_clnt_sigmask(clnt, &oldset); 993 rpc_clnt_sigmask(clnt, &oldset);
994 lock_kernel();
995 rpc_execute(&data->task); 994 rpc_execute(&data->task);
996 unlock_kernel();
997 rpc_clnt_sigunmask(clnt, &oldset); 995 rpc_clnt_sigunmask(clnt, &oldset);
998} 996}
999 997