From patchwork Wed Oct 3 00:35:49 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jorge Mora X-Patchwork-Id: 1544811 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id E36BDDF6DA for ; Thu, 4 Oct 2012 05:29:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753282Ab2JDF3o (ORCPT ); Thu, 4 Oct 2012 01:29:44 -0400 Received: from mx2.netapp.com ([216.240.18.37]:48738 "EHLO mx2.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752822Ab2JDF3o (ORCPT ); Thu, 4 Oct 2012 01:29:44 -0400 X-IronPort-AV: E=Sophos;i="4.80,532,1344236400"; d="scan'208";a="697124968" Received: from smtp1.corp.netapp.com ([10.57.156.124]) by mx2-out.netapp.com with ESMTP; 03 Oct 2012 22:29:43 -0700 Received: from cyclsvl29.eng.netapp.com (cyclsvl29.eng.netapp.com [10.56.8.224]) by smtp1.corp.netapp.com (8.13.1/8.13.1/NTAP-1.6) with ESMTP id q945ThIv001094; Wed, 3 Oct 2012 22:29:43 -0700 (PDT) Received: from cyclsvl29.eng.netapp.com (localhost.localdomain [127.0.0.1]) by cyclsvl29.eng.netapp.com (8.13.8/8.13.8) with ESMTP id q945TaSm020930; Wed, 3 Oct 2012 22:29:43 -0700 Received: (from mora@localhost) by cyclsvl29.eng.netapp.com (8.13.8/8.13.8/Submit) id q930ZpOg011369; Tue, 2 Oct 2012 17:35:51 -0700 From: Jorge Mora To: Trond.Myklebust@netapp.com Cc: linux-nfs@vger.kernel.org, Jorge Mora Subject: [PATCH] NFSv4.1: Use correct stateid for read/write Date: Tue, 2 Oct 2012 17:35:49 -0700 Message-Id: <1349224549-11194-1-git-send-email-mora@cyclsvl29.eng.netapp.com> X-Mailer: git-send-email 1.7.9.5 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org From: Jorge Mora On pNFS, the correct stateid for read/write should not be the LOCK stateid when the file has a byte range lock. Signed-off-by: Jorge Mora --- Fixes bug on Trond's testing branch fs/nfs/nfs4state.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c index c351e6b..681e659 100644 --- a/fs/nfs/nfs4state.c +++ b/fs/nfs/nfs4state.c @@ -1036,7 +1036,8 @@ void nfs4_select_rw_stateid(nfs4_stateid *dst, struct nfs4_state *state, { if (nfs4_copy_delegation_stateid(dst, state->inode, fmode)) return; - if (nfs4_copy_lock_stateid(dst, state, lockowner)) + if (pnfs_get_ds_info(state->inode) == NULL && + nfs4_copy_lock_stateid(dst, state, lockowner)) return; nfs4_copy_open_stateid(dst, state); }