From 8a23dbf717afdac500b7650f469cb5fd3c0a89fe Mon Sep 17 00:00:00 2001
From: "J. Bruce Fields" <bfields@redhat.com>
Date: Fri, 26 Oct 2012 16:04:08 -0400
Subject: [PATCH] --- yaml --- r: 347631 b: refs/heads/master c:
 fae5096ad217db2e3368e980c1d86223f786856b h: refs/heads/master i:   347629:
 a9af9a38f098103756f08819c3fb3676201a44d5   347627:
 84d702cf58c3d077d250a5e1c469a086eb6a4737   347623:
 5c96db0c18cd17fa9fe856b111526576e771c82a   347615:
 d81dce8e701d2649460e870539d12dbfce420dda v: v3

---
 [refs]              |  2 +-
 trunk/fs/nfsd/vfs.c | 13 -------------
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index 4ca87267747a..c02b0a92fc62 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7fa10cd12df3ec0873a5db0d8dc8e978423b87dc
+refs/heads/master: fae5096ad217db2e3368e980c1d86223f786856b
diff --git a/trunk/fs/nfsd/vfs.c b/trunk/fs/nfsd/vfs.c
index c120b48ec305..ed3eb59b607e 100644
--- a/trunk/fs/nfsd/vfs.c
+++ b/trunk/fs/nfsd/vfs.c
@@ -1020,21 +1020,8 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
 	inode = dentry->d_inode;
 	exp   = fhp->fh_export;
 
-	/*
-	 * Request sync writes if
-	 *  -	the sync export option has been set, or
-	 *  -	the client requested O_SYNC behavior (NFSv3 feature).
-	 *  -   The file system doesn't support fsync().
-	 * When NFSv2 gathered writes have been configured for this volume,
-	 * flushing the data to disk is handled separately below.
-	 */
 	use_wgather = (rqstp->rq_vers == 2) && EX_WGATHER(exp);
 
-	if (!file->f_op->fsync) {/* COMMIT3 cannot work */
-	       stable = 2;
-	       *stablep = 2; /* FILE_SYNC */
-	}
-
 	if (!EX_ISSYNC(exp))
 		stable = 0;
 	if (stable && !use_wgather) {