Commit 1ae04b25 authored Feb 23, 2015 by Trond Myklebust

NFSv3: Use the readdir fileid as the mounted-on-fileid



When we call readdirplus, set the fileid normally returned by readdir
as the mounted-on-fileid, since that is commonly the case if there is
a mountpoint. To ensure that we get it right, we only set the flag if
the readdir fileid differs from the one returned in the readdirplus
attributes.

This again means that we can avoid the issues described in commit
2ef47eb1 ("NFS: Fix use of nfs_attr_use_mounted_on_fileid()"),
which only fixed NFSv4.

Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>

parent 6c441c25

fs/nfs/nfs3xdr.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -1987,6 +1987,11 @@ int nfs3_decode_dirent(struct xdr_stream xdr, struct nfs_entry entry,
		if (entry->fattr->valid & NFS_ATTR_FATTR_V3)
		entry->d_type = nfs_umode_to_dtype(entry->fattr->mode);

		if (entry->fattr->fileid != entry->ino) {
		entry->fattr->mounted_on_fileid = entry->ino;
		entry->fattr->valid \|= NFS_ATTR_FATTR_MOUNTED_ON_FILEID;
		}

		/* In fact, a post_op_fh3: */
		p = xdr_inline_decode(xdr, 4);
		if (unlikely(p == NULL))

Admin message