---

yaml
---
r: 139519
b: refs/heads/master
c: 69aaaae
h: refs/heads/master
i:
  139517: 3dcfcf7
  139515: 11d2d2f
  139511: fcbfd59
  139503: 82459ac
  139487: fd10949
  139455: c7549e2
  139391: 0254053
  139263: 78d0ae8
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 409924e4c943072a63c43bb6b77576bf12f1896b
+refs/heads/master: 69aaaae18f7027d9594bce100378f102926cc0be

trunk/fs/nfs/nfs4proc.c

@@ -3678,6 +3678,19 @@ ssize_t nfs4_listxattr(struct dentry *dentry, char *buf, size_t buflen)
 	return len;
 }
 
+static void nfs_fixup_referral_attributes(struct nfs_fattr *fattr)
+{
+	if (!((fattr->valid & NFS_ATTR_FATTR_FILEID) &&
+		(fattr->valid & NFS_ATTR_FATTR_FSID) &&
+		(fattr->valid & NFS_ATTR_FATTR_V4_REFERRAL)))
+		return;
+
+	fattr->valid |= NFS_ATTR_FATTR_TYPE | NFS_ATTR_FATTR_MODE |
+		NFS_ATTR_FATTR_NLINK;
+	fattr->mode = S_IFDIR | S_IRUGO | S_IXUGO;
+	fattr->nlink = 2;
+}
+
 int nfs4_proc_fs_locations(struct inode *dir, const struct qstr *name,
 		struct nfs4_fs_locations *fs_locations, struct page *page)
 {
@@ -3704,6 +3717,7 @@ int nfs4_proc_fs_locations(struct inode *dir, const struct qstr *name,
 	fs_locations->server = server;
 	fs_locations->nlocations = 0;
 	status = rpc_call_sync(server->client, &msg, 0);
+	nfs_fixup_referral_attributes(&fs_locations->fattr);
 	dprintk("%s: returned status = %d\n", __func__, status);
 	return status;
 }