From patchwork Wed Mar 23 13:27:44 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fred Isaman X-Patchwork-Id: 655611 X-Patchwork-Delegate: Trond.Myklebust@netapp.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p2NDS4L1031555 for ; Wed, 23 Mar 2011 13:28:05 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932815Ab1CWN2D (ORCPT ); Wed, 23 Mar 2011 09:28:03 -0400 Received: from mx2.netapp.com ([216.240.18.37]:19419 "EHLO mx2.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932868Ab1CWN2C (ORCPT ); Wed, 23 Mar 2011 09:28:02 -0400 X-IronPort-AV: E=Sophos;i="4.63,231,1299484800"; d="scan'208";a="533610322" Received: from smtp1.corp.netapp.com ([10.57.156.124]) by mx2-out.netapp.com with ESMTP; 23 Mar 2011 06:28:02 -0700 Received: from localhost.localdomain (pmora01-lxp.hq.netapp.com [10.58.61.135] (may be forged)) by smtp1.corp.netapp.com (8.13.1/8.13.1/NTAP-1.6) with ESMTP id p2NDS0d8011685; Wed, 23 Mar 2011 06:28:01 -0700 (PDT) From: Fred Isaman To: linux-nfs@vger.kernel.org Cc: Trond Myklebust Subject: [PATCH 01/12] NFSv4.1: don't send COMMIT to ds for data sync writes Date: Wed, 23 Mar 2011 09:27:44 -0400 Message-Id: <1300886875-5016-2-git-send-email-iisaman@netapp.com> X-Mailer: git-send-email 1.7.2.1 In-Reply-To: <1300886875-5016-1-git-send-email-iisaman@netapp.com> References: <1300886875-5016-1-git-send-email-iisaman@netapp.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Wed, 23 Mar 2011 13:28:05 +0000 (UTC) diff --git a/fs/nfs/write.c b/fs/nfs/write.c index 55a8c36..92b4a66 100644 --- a/fs/nfs/write.c +++ b/fs/nfs/write.c @@ -474,7 +474,10 @@ nfs_clear_request_commit(struct nfs_page *req) static inline int nfs_write_need_commit(struct nfs_write_data *data) { - return data->verf.committed != NFS_FILE_SYNC; + if (data->verf.committed == NFS_DATA_SYNC) + return data->lseg == NULL; + else + return data->verf.committed != NFS_FILE_SYNC; } static inline