From d6bb7017fbbe5066a24aba7b1214842f7cc8936d Mon Sep 17 00:00:00 2001 From: Fred Isaman Date: Fri, 20 Apr 2012 14:47:40 -0400 Subject: [PATCH] --- yaml --- r: 308538 b: refs/heads/master c: 31f6852a4c187c031456581b35e146c0d5bbdecd h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/nfs/direct.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 826b206a2bf5..3eb19627a9b5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0b7c01533aa9f4a228d07d2768d084acb3a387bc +refs/heads/master: 31f6852a4c187c031456581b35e146c0d5bbdecd diff --git a/trunk/fs/nfs/direct.c b/trunk/fs/nfs/direct.c index 5897dfe48118..fb7fbaa79c20 100644 --- a/trunk/fs/nfs/direct.c +++ b/trunk/fs/nfs/direct.c @@ -357,15 +357,15 @@ static ssize_t nfs_direct_read_schedule_segment(struct nfs_direct_req *dreq, task = rpc_run_task(&task_setup_data); if (IS_ERR(task)) break; - rpc_put_task(task); dprintk("NFS: %5u initiated direct read call " "(req %s/%Ld, %zu bytes @ offset %Lu)\n", - data->task.tk_pid, + task->tk_pid, inode->i_sb->s_id, (long long)NFS_FILEID(inode), bytes, (unsigned long long)data->args.offset); + rpc_put_task(task); started += bytes; user_addr += bytes; @@ -784,15 +784,15 @@ static ssize_t nfs_direct_write_schedule_segment(struct nfs_direct_req *dreq, task = rpc_run_task(&task_setup_data); if (IS_ERR(task)) break; - rpc_put_task(task); dprintk("NFS: %5u initiated direct write call " "(req %s/%Ld, %zu bytes @ offset %Lu)\n", - data->task.tk_pid, + task->tk_pid, inode->i_sb->s_id, (long long)NFS_FILEID(inode), bytes, (unsigned long long)data->args.offset); + rpc_put_task(task); started += bytes; user_addr += bytes;