From 09da0f0870dbb79d6e6dfddbfa452152c510d467 Mon Sep 17 00:00:00 2001 From: Soumya Koduri Date: Fri, 10 Jul 2015 11:23:07 +0530 Subject: syncop: Include iatt to 'syncop_link' args Include iatt to 'syncop_link' args to fetch proper attributes of the newly linked inode. This is backport of the below fix - http://review.gluster.org/11611 Change-Id: If6b92961bd7a89add3791ed3a9b494087348b492 BUG: 1243408 Reviewed-on: http://review.gluster.org/11611 Reviewed-by: Shyamsundar Ranganathan Reviewed-by: Kaleb KEITHLEY Signed-off-by: Soumya Koduri Reviewed-on: http://review.gluster.org/11677 Tested-by: Gluster Build System --- api/src/glfs-fops.c | 4 ++-- api/src/glfs-handleops.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'api') diff --git a/api/src/glfs-fops.c b/api/src/glfs-fops.c index 2997452e5c3..eaf18051f9c 100644 --- a/api/src/glfs-fops.c +++ b/api/src/glfs-fops.c @@ -1996,7 +1996,7 @@ retrynew: } newloc.inode = inode_ref (oldloc.inode); - ret = syncop_link (subvol, &oldloc, &newloc, NULL, NULL); + ret = syncop_link (subvol, &oldloc, &newloc, &newiatt, NULL, NULL); DECODE_SYNCOP_ERR (ret); if (ret == -1 && errno == ESTALE) { @@ -2007,7 +2007,7 @@ retrynew: } if (ret == 0) - ret = glfs_loc_link (&newloc, &oldiatt); + ret = glfs_loc_link (&newloc, &newiatt); out: loc_wipe (&oldloc); loc_wipe (&newloc); diff --git a/api/src/glfs-handleops.c b/api/src/glfs-handleops.c index 9a85f194451..2e552b763dc 100644 --- a/api/src/glfs-handleops.c +++ b/api/src/glfs-handleops.c @@ -1572,6 +1572,7 @@ pub_glfs_h_link (struct glfs *fs, struct glfs_object *linksrc, inode_t *pinode = NULL; loc_t oldloc = {0, }; loc_t newloc = {0, }; + struct iatt iatt = {0, }; DECLARE_OLD_THIS; @@ -1629,12 +1630,11 @@ pub_glfs_h_link (struct glfs *fs, struct glfs_object *linksrc, newloc.inode = inode_ref (inode); /* fop/op */ - ret = syncop_link (subvol, &oldloc, &newloc, NULL, NULL); + ret = syncop_link (subvol, &oldloc, &newloc, &iatt, NULL, NULL); DECODE_SYNCOP_ERR (ret); if (ret == 0) - /* TODO: No iatt to pass as there has been no lookup */ - ret = glfs_loc_link (&newloc, NULL); + ret = glfs_loc_link (&newloc, &iatt); out: loc_wipe (&oldloc); loc_wipe (&newloc); -- cgit