From: Fred Isaman <iisaman@netapp.com>
Date: Wed, 23 Mar 2011 13:27:55 +0000 (+0000)
Subject: NFSv4.1 remove temp code that prevented ds commits
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=cccb4d063b263ac0713ab27d98460fda3b4f83ff;p=linux-beck.git

NFSv4.1 remove temp code that prevented ds commits

Now that all the infrastructure is in place, we will do the
right thing if we remove this special casing.

Signed-off-by: Fred Isaman <iisaman@netapp.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
---

diff --git a/fs/nfs/nfs4filelayout.c b/fs/nfs/nfs4filelayout.c
index fc1a0e9c1270..ffb54a082f3a 100644
--- a/fs/nfs/nfs4filelayout.c
+++ b/fs/nfs/nfs4filelayout.c
@@ -385,10 +385,6 @@ filelayout_write_pagelist(struct nfs_write_data *data, int sync)
 		data->inode->i_ino, sync, (size_t) data->args.count, offset,
 		ntohl(ds->ds_ip_addr), ntohs(ds->ds_port));
 
-	/* We can't handle commit to ds yet */
-	if (!FILELAYOUT_LSEG(lseg)->commit_through_mds)
-		data->args.stable = NFS_FILE_SYNC;
-
 	data->write_done_cb = filelayout_write_done_cb;
 	data->ds_clp = ds->ds_clp;
 	fh = nfs4_fl_select_ds_fh(lseg, j);