From 6da4cc87ff5545bd2ae7d5a45a4468e77aac2198 Mon Sep 17 00:00:00 2001 From: Raghavendra Bhat Date: Mon, 6 Dec 2010 07:35:24 +0000 Subject: check if the file is a symlink while doing utimes Signed-off-by: Raghavendra Bhat Signed-off-by: Anand V. Avati BUG: 881 (GlusterFS daemon hangs on replication of symlink (3.0.4)) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=881 --- xlators/storage/posix/src/posix.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/xlators/storage/posix/src/posix.c b/xlators/storage/posix/src/posix.c index 0000973c2..10c8ec81c 100644 --- a/xlators/storage/posix/src/posix.c +++ b/xlators/storage/posix/src/posix.c @@ -634,6 +634,18 @@ posix_do_utimes (xlator_t *this, { int32_t ret = -1; struct timeval tv[2] = {{0,},{0,}}; + struct stat stat; + int is_symlink = 0; + + ret = sys_lstat (path, &stat); + if (ret != 0) { + gf_log (this->name, GF_LOG_WARNING, + "%s (%s)", path, strerror (errno)); + goto out; + } + + if (S_ISLNK (stat.st_mode)) + is_symlink = 1; tv[0].tv_sec = stbuf->st_atime; tv[0].tv_usec = ST_ATIM_NSEC (stbuf) / 1000; @@ -642,9 +654,14 @@ posix_do_utimes (xlator_t *this, ret = lutimes (path, tv); if ((ret == -1) && (errno == ENOSYS)) { + if (is_symlink) { + ret = 0; + goto out; + } ret = utimes (path, tv); } +out: return ret; } -- cgit