From patchwork Mon Apr 11 20:56:57 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan Schumaker X-Patchwork-Id: 698861 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 p3BKv40A016931 for ; Mon, 11 Apr 2011 20:57:04 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755274Ab1DKU5C (ORCPT ); Mon, 11 Apr 2011 16:57:02 -0400 Received: from mx2.netapp.com ([216.240.18.37]:19745 "EHLO mx2.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754239Ab1DKU5B (ORCPT ); Mon, 11 Apr 2011 16:57:01 -0400 X-IronPort-AV: E=Sophos;i="4.64,193,1301900400"; d="scan'208";a="540639829" Received: from smtp1.corp.netapp.com ([10.57.156.124]) by mx2-out.netapp.com with ESMTP; 11 Apr 2011 13:57:01 -0700 Received: from [10.30.16.32] (nilsen-lxp.hq.netapp.com [10.30.16.32] (may be forged)) by smtp1.corp.netapp.com (8.13.1/8.13.1/NTAP-1.6) with ESMTP id p3BKuv9l020811; Mon, 11 Apr 2011 13:56:58 -0700 (PDT) Message-ID: <4DA36B19.8080200@netapp.com> Date: Mon, 11 Apr 2011 16:56:57 -0400 From: Bryan Schumaker User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.15) Gecko/20110307 Lightning/1.0b2 Lanikai/3.1.9 MIME-Version: 1.0 To: Jiri Slaby CC: "Myklebust, Trond" , linux-kernel@vger.kernel.org, akpm@linux-foundation.org, mm-commits@vger.kernel.org, ML netdev , linux-nfs@vger.kernel.org, Jiri Slaby Subject: Re: nfs client doesn't work [was: mmotm 2011-03-31-14-48 uploaded] References: <201103312224.p2VMOA5g000983@imap1.linux-foundation.org> <4D96E4C5.2080302@suse.cz> <1302122693.16786.0.camel@lade.trondhjem.org> <4D9D5CC9.2040002@suse.cz> <4DA36722.2020402@suse.cz> In-Reply-To: <4DA36722.2020402@suse.cz> 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]); Mon, 11 Apr 2011 20:57:04 +0000 (UTC) On 04/11/2011 04:40 PM, Jiri Slaby wrote: > On 04/07/2011 08:42 AM, Jiri Slaby wrote: >> On 04/06/2011 10:44 PM, Myklebust, Trond wrote: >>> On Sat, 2011-04-02 at 10:56 +0200, Jiri Slaby wrote: >>>> On 03/31/2011 11:48 PM, akpm@linux-foundation.org wrote: >>>>> The mm-of-the-moment snapshot 2011-03-31-14-48 has been uploaded to >>>> >>>> Hi, nfs client is defunct in this kernel. Tcpdump says: >>>> 10:51:55.489717 IP 10.20.11.33.759945860 > 10.20.3.2.2049: 132 getattr >>>> fh 0,0/24 >>>> 10:51:55.515927 IP 10.20.3.2.2049 > 10.20.11.33.759945860: reply ok 44 >>>> getattr ERROR: Operation not permitted >>>> 10:51:55.515949 IP 10.20.11.33.921 > 10.20.3.2.2049: Flags [.], ack >>>> 3569361440, win 115, options [nop,nop,TS val 599750 ecr 255058541], >>> length 0 >>>> 10:52:04.130310 IP 10.20.11.33.793500292 > 10.20.3.2.2049: 76 getattr fh >>>> 0,0/24 >>>> 10:52:04.152178 IP 10.20.3.2.2049 > 10.20.11.33.793500292: reply ok 44 >>>> getattr ERROR: Operation not permitted >>>> >>>> If I run the same mount command (mount -oro,intr host:dir mountpoint) >>>> from within a virtual machine with 2.6.38.2 there, everything mounts OK. >>> >>> Does the attached patch help? >> >> No, still the operation not permitted in the tcpdump output and no mount. Does this patch help? - Bryan When attempting an initial mount, we should only attempt other authflavors if AUTH_UNIX receives a NFS4ERR_WRONGSEC error. This allows other errors to be passed back to userspace programs. Signed-off-by: Bryan Schumaker --- > > The next tree from 20110411 still doesn't work. The topmost commit in > fs/nfs/namespace.c is: > commit 418875900e3de4831c84f86ae4756690dac5be77 > Author: Bryan Schumaker > Date: Wed Apr 6 14:33:28 2011 -0400 > > NFS: Fix a signed vs. unsigned secinfo bug > > > I bisected it to (in vanilla already): > > 8f70e95f9f4159184f557a1db60c909d7c1bd2e3 is the first bad commit > commit 8f70e95f9f4159184f557a1db60c909d7c1bd2e3 > Author: Bryan Schumaker > Date: Thu Mar 24 17:12:31 2011 +0000 > > NFS: Determine initial mount security > > When sec= is not presented as a mount option, > we should attempt to determine what security flavor the > server is using. > > Signed-off-by: Bryan Schumaker > Signed-off-by: Trond Myklebust > > :040000 040000 8e5a640b37e00f0df21e1d9cd9aff160df2d5938 > 0152daa67bc8d12e32cda5f4a036807d2e380392 M fs > :040000 040000 f74aa33f8597cb82cd0fd7d90d84e0660b7f5804 > 527bc0ca6975cedc7e684b45dc9961f8aaf1207a M include > :040000 040000 87559d2f211ea905343a86c8551b6610dd239891 > 7e4ee0e5eddf12474b6de9e7fdb6218b6165bdb2 M net > > thanks, -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index dfd1e6d..9bf41ea 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -2204,8 +2204,6 @@ static int nfs4_lookup_root_sec(struct nfs_server *server, struct nfs_fh *fhandl goto out; } ret = nfs4_lookup_root(server, fhandle, info); - if (ret < 0) - ret = -EAGAIN; out: return ret; } @@ -2226,7 +2224,7 @@ static int nfs4_proc_get_root(struct nfs_server *server, struct nfs_fh *fhandle, for (i = 0; i < len; i++) { status = nfs4_lookup_root_sec(server, fhandle, info, flav_array[i]); - if (status == 0) + if (status != -EPERM) break; } if (status == 0)