From patchwork Thu Jun 2 15:17:20 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Adamson X-Patchwork-Id: 843922 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 p52FIDE5025459 for ; Thu, 2 Jun 2011 15:18:14 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752484Ab1FBPSN (ORCPT ); Thu, 2 Jun 2011 11:18:13 -0400 Received: from mx2.netapp.com ([216.240.18.37]:8386 "EHLO mx2.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752316Ab1FBPSM (ORCPT ); Thu, 2 Jun 2011 11:18:12 -0400 X-IronPort-AV: E=Sophos;i="4.65,310,1304319600"; d="scan'208";a="552545939" Received: from smtp1.corp.netapp.com ([10.57.156.124]) by mx2-out.netapp.com with ESMTP; 02 Jun 2011 08:17:57 -0700 Received: from localhost.localdomain ([10.58.49.237]) by smtp1.corp.netapp.com (8.13.1/8.13.1/NTAP-1.6) with ESMTP id p52FHusg001634; Thu, 2 Jun 2011 08:17:56 -0700 (PDT) From: andros@netapp.com To: trond.myklebust@netapp.com Cc: linux-nfs@vger.kernel.org, Andy Adamson Subject: [PATCH 1/1] NFSv4.1 fs_locations compound request fileid Date: Thu, 2 Jun 2011 11:17:20 -0400 Message-Id: <1307027840-3137-1-git-send-email-andros@netapp.com> X-Mailer: git-send-email 1.6.6 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]); Thu, 02 Jun 2011 15:18:14 +0000 (UTC) From: Andy Adamson Commit 28331a46d88459788c8fca72dbb0415cd7f514c9 "Ensure we request the ordinary fileid when doing readdirplus" changed the meaning of NFS_ATTR_FATTR_FILEID which used to be set when FATTR4_WORD1_MOUNTED_ON_FILED was requested. Request FATTR4_WORD0_FILEID in the nfs4_proc_fs_locations GETATTR so that nfs_fhget succeeds and the referral is mounted. Signed-off-by: Andy Adamson --- fs/nfs/nfs4proc.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index d2c4b59..d99c5f8 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -4685,7 +4685,8 @@ int nfs4_proc_fs_locations(struct inode *dir, const struct qstr *name, { struct nfs_server *server = NFS_SERVER(dir); u32 bitmask[2] = { - [0] = FATTR4_WORD0_FSID | FATTR4_WORD0_FS_LOCATIONS, + [0] = FATTR4_WORD0_FSID | FATTR4_WORD0_FS_LOCATIONS | + FATTR4_WORD0_FILEID, [1] = FATTR4_WORD1_MOUNTED_ON_FILEID, }; struct nfs4_fs_locations_arg args = {