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

Commit 1fa1e384 authored by NeilBrown's avatar NeilBrown Committed by Trond Myklebust
Browse files

NFS: teach nfs_lookup_verify_inode to handle LOOKUP_RCU 



It fails with -ECHILD rather than make an RPC call.

This allows nfs_lookup_revalidate to call it in RCU-walk mode.

Signed-off-by: default avatarNeilBrown <neilb@suse.de>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent 912a108d

fs/nfs/dir.c

+6 −4
Original line number Diff line number Diff line
@@ -1050,6 +1050,8 @@ int nfs_lookup_verify_inode(struct inode *inode, unsigned int flags) 
out:

	return (inode->i_nlink == 0) ? -ENOENT : 0;

out_force:

	if (flags & LOOKUP_RCU)

		return -ECHILD;

	ret = __nfs_revalidate_inode(server, inode);

	if (ret != 0)

		return ret;
@@ -1135,11 +1137,11 @@ static int nfs_lookup_revalidate(struct dentry *dentry, unsigned int flags) 
	if (!nfs_is_exclusive_create(dir, flags) &&

	    nfs_check_verifier(dir, dentry, flags & LOOKUP_RCU)) {



		if (nfs_lookup_verify_inode(inode, flags)) {

			if (flags & LOOKUP_RCU)

				return -ECHILD;



		if (nfs_lookup_verify_inode(inode, flags))

			goto out_zap_parent;

		}

		goto out_valid;

	}