Received-SPF: pass (google.com: best guess record for domain of linux-nfs-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Thu, 20 Feb 2020 14:46:24 +0100
From:   Patrick Steinhardt <ps@pks.im>
To:     Scott Mayhew <smayhew@redhat.com>
Cc:     trond.myklebust@hammerspace.com, anna.schumaker@netapp.com,
        dhowells@redhat.com, linux-nfs@vger.kernel.org
Subject: Re: [PATCH] NFS: Don't hard-code the fs_type when submounting
Message-ID: <20200220134618.GA4641@ncase>
References: <20200220130620.3547817-1-smayhew@redhat.com>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
        protocol="application/pgp-signature"; boundary="rS8CxjVDS/+yyDmU"
Content-Disposition: inline
In-Reply-To: <20200220130620.3547817-1-smayhew@redhat.com>
Sender: linux-nfs-owner@vger.kernel.org
Precedence: bulk


--rS8CxjVDS/+yyDmU
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Thu, Feb 20, 2020 at 08:06:20AM -0500, Scott Mayhew wrote:
> Hard-coding the fstype causes "nfs4" mounts to appear as "nfs",
> which breaks scripts that do "umount -at nfs4".
>=20
> Reported-by: Patrick Steinhardt <ps@pks.im>
> Fixes: f2aedb713c28 ("NFS: Add fs_context support.")
> Signed-off-by: Scott Mayhew <smayhew@redhat.com>
> ---
>  fs/nfs/namespace.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>=20
> diff --git a/fs/nfs/namespace.c b/fs/nfs/namespace.c
> index ad6077404947..f3ece8ed3203 100644
> --- a/fs/nfs/namespace.c
> +++ b/fs/nfs/namespace.c
> @@ -153,7 +153,7 @@ struct vfsmount *nfs_d_automount(struct path *path)
>  	/* Open a new filesystem context, transferring parameters from the
>  	 * parent superblock, including the network namespace.
>  	 */
> -	fc =3D fs_context_for_submount(&nfs_fs_type, path->dentry);
> +	fc =3D fs_context_for_submount(path->mnt->mnt_sb->s_type, path->dentry);
>  	if (IS_ERR(fc))
>  		return ERR_CAST(fc);

Thanks for your fix! While this fixes the fstype with mount.nfs4(8),
it still doesn't work when using mount(8):

     $ sudo mount server:/mnt /mnt && findmnt -n -ofstype /mnt
     nfs
     $ sudo umount /mnt
     $ sudo mount.nfs4 server:/mnt /mnt && findmnt -n -ofstype /mnt
     nfs4

I guess the issue is that the kernel doesn't yet know which NFS version
the server provides at the point where `fs_context_for_submount()` is
called.

Patrick

--rS8CxjVDS/+yyDmU
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQIzBAABCAAdFiEEtmscHsieVjl9VyNUEXxntp6r8SwFAl5OjbAACgkQEXxntp6r
8Sy4Pg//T70Hg2dkRl6cy4DP5tUvuLGO8rhDRAH3b4A7z6YDvXYfVQ9oV4oYynxP
cgrTMIhjsl0W9egrKx+BCa0OmM5rjl9inp4xkwygAsuVNv7lsc+etke8zLxCslCS
kEhMQmOBFMInOyzcKvJQqJIzidokrK7HYQUu4Q/5wi03p98FgQwVa2TBVLWNBJh3
N4TLlEjw4dv45NuLSotyznxkw9QR6HL9Ro+C20T5p87Zk5T6qiCB5hV75bg0DFGY
Pwa4qCR22qba9lrgKUCQcO4EJ2vaDfulvpuD6kJ/nNCamEFnQemBZ3XrdB8x9/yd
EMELWIjvOLsu+Zj/KTzIvMfX8nLmBJbSR4ob9kSHLqmbccg39wXdJhvaHXmQVmHQ
VNxSLfhW4HDa3ADXOuuuaOBI8y2B4WtG8dHVdu+cSSGtDk0rDvNsT5Z/z/gVuMJh
75OK4dkC3+vy6trKF8NQqDa3r9xpZGfjageGq6wHuM5mwrciY4aE7f7tVcLY5BmI
eJ8QtgxFNJk3QC0kd3zaBsnkhXt2qazf0WyOwgsvNedfMA3UY3ucbKcoLOfiNdAE
t3dHIHn4S7umJZZmSyA7RtOH8PX101bNJAcnuLFTtEY/qn5MIeLbmpYo1UvqrYCO
2HKLah1oaGcFNBb2LzI8uRsz0adziaEyO6uHG0HrNzC5q3lb5ik=
=+INL
-----END PGP SIGNATURE-----

--rS8CxjVDS/+yyDmU--