diff options
Diffstat (limited to 'fs/nfs/direct.c')
| -rw-r--r-- | fs/nfs/direct.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c index 0f583cb16ddb..3c72b0c07283 100644 --- a/fs/nfs/direct.c +++ b/fs/nfs/direct.c | |||
| @@ -112,10 +112,9 @@ static void nfs_direct_write_complete(struct nfs_direct_req *dreq, struct inode | |||
| 112 | */ | 112 | */ |
| 113 | ssize_t nfs_direct_IO(int rw, struct kiocb *iocb, const struct iovec *iov, loff_t pos, unsigned long nr_segs) | 113 | ssize_t nfs_direct_IO(int rw, struct kiocb *iocb, const struct iovec *iov, loff_t pos, unsigned long nr_segs) |
| 114 | { | 114 | { |
| 115 | struct dentry *dentry = iocb->ki_filp->f_dentry; | ||
| 116 | |||
| 117 | dprintk("NFS: nfs_direct_IO (%s) off/no(%Ld/%lu) EINVAL\n", | 115 | dprintk("NFS: nfs_direct_IO (%s) off/no(%Ld/%lu) EINVAL\n", |
| 118 | dentry->d_name.name, (long long) pos, nr_segs); | 116 | iocb->ki_filp->f_dentry->d_name.name, |
| 117 | (long long) pos, nr_segs); | ||
| 119 | 118 | ||
| 120 | return -EINVAL; | 119 | return -EINVAL; |
| 121 | } | 120 | } |
| @@ -468,7 +467,6 @@ static const struct rpc_call_ops nfs_commit_direct_ops = { | |||
| 468 | static void nfs_direct_commit_schedule(struct nfs_direct_req *dreq) | 467 | static void nfs_direct_commit_schedule(struct nfs_direct_req *dreq) |
| 469 | { | 468 | { |
| 470 | struct nfs_write_data *data = dreq->commit_data; | 469 | struct nfs_write_data *data = dreq->commit_data; |
| 471 | struct rpc_task *task = &data->task; | ||
| 472 | 470 | ||
| 473 | data->inode = dreq->inode; | 471 | data->inode = dreq->inode; |
| 474 | data->cred = dreq->ctx->cred; | 472 | data->cred = dreq->ctx->cred; |
| @@ -489,7 +487,7 @@ static void nfs_direct_commit_schedule(struct nfs_direct_req *dreq) | |||
| 489 | /* Note: task.tk_ops->rpc_release will free dreq->commit_data */ | 487 | /* Note: task.tk_ops->rpc_release will free dreq->commit_data */ |
| 490 | dreq->commit_data = NULL; | 488 | dreq->commit_data = NULL; |
| 491 | 489 | ||
| 492 | dprintk("NFS: %5u initiated commit call\n", task->tk_pid); | 490 | dprintk("NFS: %5u initiated commit call\n", data->task.tk_pid); |
| 493 | 491 | ||
| 494 | lock_kernel(); | 492 | lock_kernel(); |
| 495 | rpc_execute(&data->task); | 493 | rpc_execute(&data->task); |
