Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 357d42d5 authored by Trond Myklebust's avatar Trond Myklebust Committed by Greg Kroah-Hartman
Browse files

NFS: LOOKUP_DIRECTORY is also ok with symlinks 



commit e0caaf75d443e02e55e146fd75fe2efc8aed5540 upstream.

Commit ac795161c936 (NFSv4: Handle case where the lookup of a directory
fails) [1], part of Linux since 5.17-rc2, introduced a regression, where
a symbolic link on an NFS mount to a directory on another NFS does not
resolve(?) the first time it is accessed:

Reported-by: default avatarPaul Menzel <pmenzel@molgen.mpg.de>
Fixes: ac795161c936 ("NFSv4: Handle case where the lookup of a directory fails")
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
Tested-by: default avatarDonald Buczek <buczek@molgen.mpg.de>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 20f4ee3c

fs/nfs/dir.c

+2 −2
Original line number Diff line number Diff line
@@ -1641,14 +1641,14 @@ int nfs_atomic_open(struct inode *dir, struct dentry *dentry, 
	if (!res) {

		inode = d_inode(dentry);

		if ((lookup_flags & LOOKUP_DIRECTORY) && inode &&

		    !S_ISDIR(inode->i_mode))

		    !(S_ISDIR(inode->i_mode) || S_ISLNK(inode->i_mode)))

			res = ERR_PTR(-ENOTDIR);

		else if (inode && S_ISREG(inode->i_mode))

			res = ERR_PTR(-EOPENSTALE);

	} else if (!IS_ERR(res)) {

		inode = d_inode(res);

		if ((lookup_flags & LOOKUP_DIRECTORY) && inode &&

		    !S_ISDIR(inode->i_mode)) {

		    !(S_ISDIR(inode->i_mode) || S_ISLNK(inode->i_mode))) {

			dput(res);

			res = ERR_PTR(-ENOTDIR);

		} else if (inode && S_ISREG(inode->i_mode)) {