diff --git a/fs/orangefs/inode.c b/fs/orangefs/inode.c
index 8f047722cb44e325332ef070a365ea619a5917b3..2e521ec734c496fe46b82c1693cdee77efb45777 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 36ee30d1f0ad0077e20683950d5da48a79554f48..40f5163b56aa02142b4be4ed64eabd5a96ccfc18 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;
 	}