aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Brandenburg <martin@omnibond.com>2016-03-18 14:20:15 -0400
committerMike Marshall <hubcap@omnibond.com>2016-03-23 17:36:16 -0400
commite8da254c415475d3df67966a198523bfe3ac0576 (patch)
treec27f66da4a27e998d331e04363eb9a05212a18e9
parent05d31c5cb34cbdf05f9326b276be03756abb4b70 (diff)
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>
-rw-r--r--fs/orangefs/inode.c2
-rw-r--r--fs/orangefs/orangefs-utils.c1
2 files changed, 1 insertions, 2 deletions
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,
275 /* override block size reported to stat */ 275 /* override block size reported to stat */
276 orangefs_inode = ORANGEFS_I(inode); 276 orangefs_inode = ORANGEFS_I(inode);
277 kstat->blksize = orangefs_inode->blksize; 277 kstat->blksize = orangefs_inode->blksize;
278
279 inode->i_link = ORANGEFS_I(dentry->d_inode)->link_target;
280 } 278 }
281 return ret; 279 return ret;
282} 280}
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)
318 strlcpy(orangefs_inode->link_target, 318 strlcpy(orangefs_inode->link_target,
319 new_op->downcall.resp.getattr.link_target, 319 new_op->downcall.resp.getattr.link_target,
320 ORANGEFS_NAME_MAX); 320 ORANGEFS_NAME_MAX);
321 inode->i_link = orangefs_inode->link_target;
321 } 322 }
322 break; 323 break;
323 } 324 }