From ac6a44aec6f0cb425b27331443f8db6042b5f32e Mon Sep 17 00:00:00 2001 From: Frank Filz Date: Tue, 17 Oct 2006 10:24:36 -0700 Subject: [PATCH] --- yaml --- r: 42503 b: refs/heads/master c: a99b71c9c43499bf2312c64f5c1d367aaf559dc4 h: refs/heads/master i: 42501: 28ff2ef6c3de9ec4697de4a316c7d5458493cd3d 42499: 20c18fd2c4c279b5b4bd07998b22b26675ec6996 42495: cdaad9d7f27b0a9fb6a08cc1c1d353e7ef9b4a0c v: v3 --- [refs] | 2 +- trunk/fs/nfs/direct.c | 6 ------ trunk/fs/nfs/read.c | 2 -- trunk/fs/nfs/write.c | 2 -- 4 files changed, 1 insertion(+), 11 deletions(-) diff --git a/[refs] b/[refs] index f1eba0147ad7..8cac919ebede 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6d5fcb5a52bfd00eab3ba2c7ca890823388436ae +refs/heads/master: a99b71c9c43499bf2312c64f5c1d367aaf559dc4 diff --git a/trunk/fs/nfs/direct.c b/trunk/fs/nfs/direct.c index bdfabf854a51..784bbb54e6c1 100644 --- a/trunk/fs/nfs/direct.c +++ b/trunk/fs/nfs/direct.c @@ -307,9 +307,7 @@ static ssize_t nfs_direct_read_schedule(struct nfs_direct_req *dreq, unsigned lo data->task.tk_cookie = (unsigned long) inode; - lock_kernel(); rpc_execute(&data->task); - unlock_kernel(); dfprintk(VFS, "NFS: %5u initiated direct read call (req %s/%Ld, %zu bytes @ offset %Lu)\n", data->task.tk_pid, @@ -475,9 +473,7 @@ static void nfs_direct_commit_schedule(struct nfs_direct_req *dreq) dprintk("NFS: %5u initiated commit call\n", data->task.tk_pid); - lock_kernel(); rpc_execute(&data->task); - unlock_kernel(); } static 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 data->task.tk_priority = RPC_PRIORITY_NORMAL; data->task.tk_cookie = (unsigned long) inode; - lock_kernel(); rpc_execute(&data->task); - unlock_kernel(); dfprintk(VFS, "NFS: %5u initiated direct write call (req %s/%Ld, %zu bytes @ offset %Lu)\n", data->task.tk_pid, diff --git a/trunk/fs/nfs/read.c b/trunk/fs/nfs/read.c index 29094a545088..cca9fa259994 100644 --- a/trunk/fs/nfs/read.c +++ b/trunk/fs/nfs/read.c @@ -323,9 +323,7 @@ static void nfs_execute_read(struct nfs_read_data *data) sigset_t oldset; rpc_clnt_sigmask(clnt, &oldset); - lock_kernel(); rpc_execute(&data->task); - unlock_kernel(); rpc_clnt_sigunmask(clnt, &oldset); } diff --git a/trunk/fs/nfs/write.c b/trunk/fs/nfs/write.c index 9b8eb9373ad4..4948dc1fbd74 100644 --- a/trunk/fs/nfs/write.c +++ b/trunk/fs/nfs/write.c @@ -991,9 +991,7 @@ static void nfs_execute_write(struct nfs_write_data *data) sigset_t oldset; rpc_clnt_sigmask(clnt, &oldset); - lock_kernel(); rpc_execute(&data->task); - unlock_kernel(); rpc_clnt_sigunmask(clnt, &oldset); }