summaryrefslogtreecommitdiffstats
path: root/fs/nfs/objlayout
diff options
context:
space:
mode:
authorWeston Andros Adamson2014-06-09 17:48:36 +0200
committerTrond Myklebust2014-06-25 00:47:00 +0200
commitc65e6254ca4db1584c5bf5f228ee26556477a9fd (patch)
treee182886537257fa1b9415bb911103fd9fa840024 /fs/nfs/objlayout
parentnfs: merge nfs_pgio_data into _header (diff)
downloadkernel-qcow2-linux-c65e6254ca4db1584c5bf5f228ee26556477a9fd.tar.gz
kernel-qcow2-linux-c65e6254ca4db1584c5bf5f228ee26556477a9fd.tar.xz
kernel-qcow2-linux-c65e6254ca4db1584c5bf5f228ee26556477a9fd.zip
nfs: remove unused writeverf code
Remove duplicate writeverf structure from merge of nfs_pgio_header and nfs_pgio_data and remove writeverf related flags and logic to handle more than one RPC per nfs_pgio_header. Signed-off-by: Weston Andros Adamson <dros@primarydata.com> Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Diffstat (limited to 'fs/nfs/objlayout')
-rw-r--r--fs/nfs/objlayout/objlayout.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nfs/objlayout/objlayout.c b/fs/nfs/objlayout/objlayout.c
index 86312787cee6..697a16d11fac 100644
--- a/fs/nfs/objlayout/objlayout.c
+++ b/fs/nfs/objlayout/objlayout.c
@@ -328,7 +328,7 @@ objlayout_write_done(struct objlayout_io_res *oir, ssize_t status, bool sync)
oir->status = hdr->task.tk_status = status;
if (status >= 0) {
hdr->res.count = status;
- hdr->writeverf.committed = oir->committed;
+ hdr->verf.committed = oir->committed;
} else {
hdr->pnfs_error = status;
}
@@ -336,7 +336,7 @@ objlayout_write_done(struct objlayout_io_res *oir, ssize_t status, bool sync)
/* must not use oir after this point */
dprintk("%s: Return status %zd committed %d sync=%d\n", __func__,
- status, hdr->writeverf.committed, sync);
+ status, hdr->verf.committed, sync);
if (sync)
pnfs_ld_write_done(hdr);