NFS: fix data_update accounting in NFS direct I/O path
authorChuck Lever <cel@netapp.com>
Mon, 20 Mar 2006 18:44:35 +0000 (13:44 -0500)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Mon, 20 Mar 2006 18:44:35 +0000 (13:44 -0500)
^C against "iozone -I" is hitting the assertion in nfs_clear_inode().

Test plan:
"iozone -i0 -I -a -c" against a slow server, then control C.  This should
not cause an oops.

Signed-off-by: Chuck Lever <cel@netapp.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
fs/nfs/direct.c

index 3de7c4b..737990d 100644 (file)
@@ -219,6 +219,7 @@ static void nfs_direct_complete(struct nfs_direct_req *dreq)
        } else
                wake_up(&dreq->wait);
 
+       iput(dreq->inode);
        kref_put(&dreq->kref, nfs_direct_req_release);
 }
 
@@ -374,6 +375,7 @@ static ssize_t nfs_direct_read(struct kiocb *iocb, unsigned long user_addr, size
 
        dreq->pages = pages;
        dreq->npages = nr_pages;
+       igrab(inode);
        dreq->inode = inode;
        dreq->filp = iocb->ki_filp;
        if (!is_sync_kiocb(iocb))
@@ -549,6 +551,7 @@ static ssize_t nfs_direct_write(struct kiocb *iocb, unsigned long user_addr, siz
 
        dreq->pages = pages;
        dreq->npages = nr_pages;
+       igrab(inode);
        dreq->inode = inode;
        dreq->filp = iocb->ki_filp;
        if (!is_sync_kiocb(iocb))