X-Git-Url: https://git.kernelconcepts.de/?a=blobdiff_plain;f=fs%2Fnfs%2Finode.c;h=2211f6ba873628485fcabf874adf0c3c985a6d84;hb=1aff0310ebdd42fa0045440cee19c5a8cfecf70c;hp=4bffe637ea3255fd2e1e6812556e3907791f4152;hpb=787140ad6bb49422e2f114e9b8df18b242df00db;p=karo-tx-linux.git

diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
index 4bffe637ea32..2211f6ba8736 100644
--- a/fs/nfs/inode.c
+++ b/fs/nfs/inode.c
@@ -352,8 +352,9 @@ nfs_fhget(struct super_block *sb, struct nfs_fh *fh, struct nfs_fattr *fattr, st
 
 	nfs_attr_check_mountpoint(sb, fattr);
 
-	if (((fattr->valid & NFS_ATTR_FATTR_FILEID) == 0) &&
-	    !nfs_attr_use_mounted_on_fileid(fattr))
+	if (nfs_attr_use_mounted_on_fileid(fattr))
+		fattr->fileid = fattr->mounted_on_fileid;
+	else if ((fattr->valid & NFS_ATTR_FATTR_FILEID) == 0)
 		goto out_no_inode;
 	if ((fattr->valid & NFS_ATTR_FATTR_TYPE) == 0)
 		goto out_no_inode;