diff options
| -rw-r--r-- | cli/src/cli3_1-cops.c | 13 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-op-sm.c | 11 |
2 files changed, 12 insertions, 12 deletions
diff --git a/cli/src/cli3_1-cops.c b/cli/src/cli3_1-cops.c index 55c69f88..1f54b86b 100644 --- a/cli/src/cli3_1-cops.c +++ b/cli/src/cli3_1-cops.c @@ -2476,16 +2476,15 @@ gf_cli3_1_gsync_status (char *master, char *slave, file = fopen (pidfile, "r+"); if (file) { - //ret = lockf (fileno (file), F_TLOCK, 0); - //if (ret == 0) { - // lockf (fileno (file), F_ULOCK, 0); - // *status = -1; - //} - //else + ret = lockf (fileno (file), F_TEST, 0); + if (ret == 0) { + *status = -1; + } + else *status = 0; } else *status = -1; - + ret = 0; out: return ret; } diff --git a/xlators/mgmt/glusterd/src/glusterd-op-sm.c b/xlators/mgmt/glusterd/src/glusterd-op-sm.c index 65203328..89e6f47c 100644 --- a/xlators/mgmt/glusterd/src/glusterd-op-sm.c +++ b/xlators/mgmt/glusterd/src/glusterd-op-sm.c @@ -1952,13 +1952,14 @@ gsync_status (char *master, char *slave, int *status) file = fopen (pidfile, "r+"); if (file) { - // ret = lockf (fileno (file), F_TEST, 0); - //if (ret == 0) - //*status = -1; - //else - *status = 0; + ret = lockf (fileno (file), F_TEST, 0); + if (ret == 0) + *status = -1; + else + *status = 0; } else *status = -1; + ret = 0; out: return ret; } |