From: Martin Brandenburg <martin@omnibond.com>
Date: Fri, 18 Mar 2016 18:20:15 +0000 (-0400)
Subject: orangefs: move code which sets i_link to orangefs_inode_getattr
X-Git-Tag: v4.6-rc1~2^2~9
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=e8da254c415475d3df67966a198523bfe3ac0576;p=linux-2.6-block.git

orangefs: move code which sets i_link to orangefs_inode_getattr

Everything else setting inode->i_ values is in there.

Signed-off-by: Martin Brandenburg <martin@omnibond.com>
Signed-off-by: Mike Marshall <hubcap@omnibond.com>
---

diff --git a/fs/orangefs/inode.c b/fs/orangefs/inode.c
index 8f047722cb44..2e521ec734c4 100644
--- a/fs/orangefs/inode.c
+++ b/fs/orangefs/inode.c
@@ -275,8 +275,6 @@ int orangefs_getattr(struct vfsmount *mnt,
 		/* override block size reported to stat */
 		orangefs_inode = ORANGEFS_I(inode);
 		kstat->blksize = orangefs_inode->blksize;
-
-		inode->i_link = ORANGEFS_I(dentry->d_inode)->link_target;
 	}
 	return ret;
 }
diff --git a/fs/orangefs/orangefs-utils.c b/fs/orangefs/orangefs-utils.c
index 36ee30d1f0ad..40f5163b56aa 100644
--- a/fs/orangefs/orangefs-utils.c
+++ b/fs/orangefs/orangefs-utils.c
@@ -318,6 +318,7 @@ int orangefs_inode_getattr(struct inode *inode, int new, int size)
 			strlcpy(orangefs_inode->link_target,
 			    new_op->downcall.resp.getattr.link_target,
 			    ORANGEFS_NAME_MAX);
+			inode->i_link = orangefs_inode->link_target;
 		}
 		break;
 	}