From: Vitaliy Gusev <gusev.vitaliy@gmail.com>
Date: Thu, 19 May 2011 21:34:46 +0000 (+0400)
Subject: nfs41: Correct offset for LAYOUTCOMMIT
X-Git-Tag: v3.0-rc1~10^2~7
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4b8ee2b82e8b0b6e17ee33feb74fcdb5c6d8dbdd;p=karo-tx-linux.git

nfs41: Correct offset for LAYOUTCOMMIT

A client sends offset to MDS as it was seen by DS. As result,
file size after copy is only half of original file size in case
of 2 DS.

Signed-off-by: Vitaliy Gusev <gusev.vitaliy@nexenta.com>
Cc: stable@kernel.org [2.6.39]
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
---

diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c
index f57f5281a520..101c85a3644e 100644
--- a/fs/nfs/pnfs.c
+++ b/fs/nfs/pnfs.c
@@ -1009,7 +1009,7 @@ void
 pnfs_set_layoutcommit(struct nfs_write_data *wdata)
 {
 	struct nfs_inode *nfsi = NFS_I(wdata->inode);
-	loff_t end_pos = wdata->args.offset + wdata->res.count;
+	loff_t end_pos = wdata->mds_offset + wdata->res.count;
 	bool mark_as_dirty = false;
 
 	spin_lock(&nfsi->vfs_inode.i_lock);