Return-Path: linux-nfs-owner@vger.kernel.org Received: from mx2.netapp.com ([216.240.18.37]:36194 "EHLO mx2.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755579Ab2FHP3I (ORCPT ); Fri, 8 Jun 2012 11:29:08 -0400 Message-ID: <4FD21A32.8050400@netapp.com> Date: Fri, 08 Jun 2012 11:28:50 -0400 From: Bryan Schumaker MIME-Version: 1.0 To: Joerg Roedel CC: Trond Myklebust , linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: NFS regression in v3.5-rc1: mount.nfs yells about incorrect mount option References: <20120607150456.GO12795@8bytes.org> <4FD0C4C2.8020605@netapp.com> <20120607155006.GR12795@8bytes.org> <4FD0CEB0.9040804@netapp.com> <20120608130352.GU12795@8bytes.org> <4FD1FC02.2000608@netapp.com> <20120608133317.GW12795@8bytes.org> <4FD1FFFD.3020301@netapp.com> <20120608134905.GX12795@8bytes.org> In-Reply-To: <20120608134905.GX12795@8bytes.org> Content-Type: text/plain; charset=ISO-8859-1 Sender: linux-nfs-owner@vger.kernel.org List-ID: On 06/08/2012 09:49 AM, Joerg Roedel wrote: > On Fri, Jun 08, 2012 at 09:37:01AM -0400, Bryan Schumaker wrote: >> On 06/08/2012 09:33 AM, Joerg Roedel wrote: > >>> Your other patch only touched the nfs4 path, but in my setup nfs3 was in >>> use. Therefore the patch didn't help. I just figured out that >>> nfs_fs_mount is shared between nfs23 and nfs4, so the first patch >>> probably breaks nfs4. I send another one which takes this into account. >> >> Would something like this work? (I haven't tried it yet). Setting it >> in nfs_alloc_parsed_mount_data() might work too... >> >> diff --git a/fs/nfs/super.c b/fs/nfs/super.c >> index bdd6731..906f09c 100644 >> --- a/fs/nfs/super.c >> +++ b/fs/nfs/super.c >> @@ -1867,6 +1867,7 @@ static int nfs23_validate_mount_data(void *options, >> if (data == NULL) >> goto out_no_data; >> >> + args->version = NFS_DEFAULT_VERSION; >> switch (data->version) { >> case 1: >> data->namlen = 0; >> -- > > Yes, this works too (tested). Doing it in nfs_alloc_parsed_mount_data() > need to take into account that the function is also called for nfs4. > This is basically what my second revert-patch does. Thanks for testing! The patch I sent you yesterday sets up "args->version = 4" if it gets into the v4 parsing code, so the v4 case should already be taken care of. - Bryan > > > Joerg > >