summaryrefslogtreecommitdiffstats
path: root/fs/nfs/nfs4filelayout.c
diff options
context:
space:
mode:
authorH. Peter Anvin2011-08-05 21:25:56 +0200
committerH. Peter Anvin2011-08-05 21:25:56 +0200
commit13f9a3737c903ace57d8aaebe81a3bbaeb0aa0a2 (patch)
tree6a81d50b611170ca6dd1ed9cce2b86dd19f190d8 /fs/nfs/nfs4filelayout.c
parentx86, intel, power: Correct the MSR_IA32_ENERGY_PERF_BIAS message (diff)
parentLinux 3.0 (diff)
downloadkernel-qcow2-linux-13f9a3737c903ace57d8aaebe81a3bbaeb0aa0a2.tar.gz
kernel-qcow2-linux-13f9a3737c903ace57d8aaebe81a3bbaeb0aa0a2.tar.xz
kernel-qcow2-linux-13f9a3737c903ace57d8aaebe81a3bbaeb0aa0a2.zip
Merge commit 'v3.0' into x86/cpu
Diffstat (limited to 'fs/nfs/nfs4filelayout.c')
-rw-r--r--fs/nfs/nfs4filelayout.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/nfs/nfs4filelayout.c b/fs/nfs/nfs4filelayout.c
index 0bafcc91c27f..f9d03abcd04c 100644
--- a/fs/nfs/nfs4filelayout.c
+++ b/fs/nfs/nfs4filelayout.c
@@ -398,7 +398,6 @@ filelayout_write_pagelist(struct nfs_write_data *data, int sync)
* this offset and save the original offset.
*/
data->args.offset = filelayout_get_dserver_offset(lseg, offset);
- data->mds_offset = offset;
/* Perform an asynchronous write */
status = nfs_initiate_write(data, ds->ds_clp->cl_rpcclient,