diff options
| author | Anand Avati <avati@redhat.com> | 2013-10-11 00:20:15 -0700 |
|---|---|---|
| committer | Anand Avati <avati@redhat.com> | 2013-11-21 13:08:32 -0800 |
| commit | 544dee895a43ec9bb98fc8ace3d124d44bb617f2 (patch) | |
| tree | 4575b15f4845e84100e7895b63e2f56975ff9618 | |
| parent | d13bf457d489559fd8c011533b2201a113243d71 (diff) | |
syncops: expose @flags in syncop_rmdir()
Change-Id: I9b73c1db728e4cb3948fc118cceb292b21d48b96
BUG: 1021686
Signed-off-by: Anand Avati <avati@redhat.com>
Reviewed-on: http://review.gluster.org/6112
Reviewed-by: Amar Tumballi <amarts@redhat.com>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
| -rw-r--r-- | api/src/glfs-fops.c | 2 | ||||
| -rw-r--r-- | api/src/glfs-handleops.c | 2 | ||||
| -rw-r--r-- | libglusterfs/src/syncop.c | 4 | ||||
| -rw-r--r-- | libglusterfs/src/syncop.h | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/api/src/glfs-fops.c b/api/src/glfs-fops.c index 93c5101a015..f3ac335fb39 100644 --- a/api/src/glfs-fops.c +++ b/api/src/glfs-fops.c @@ -1563,7 +1563,7 @@ retry: goto out; } - ret = syncop_rmdir (subvol, &loc); + ret = syncop_rmdir (subvol, &loc, 0); ESTALE_RETRY (ret, errno, reval, &loc, retry); diff --git a/api/src/glfs-handleops.c b/api/src/glfs-handleops.c index 9c707a619a5..0f996d3a2da 100644 --- a/api/src/glfs-handleops.c +++ b/api/src/glfs-handleops.c @@ -680,7 +680,7 @@ glfs_h_unlink (struct glfs *fs, struct glfs_object *parent, const char *path) goto out; } } else { - ret = syncop_rmdir (subvol, &loc); + ret = syncop_rmdir (subvol, &loc, 0); if (ret != 0) { goto out; } diff --git a/libglusterfs/src/syncop.c b/libglusterfs/src/syncop.c index 25baa021ada..1f36e57766c 100644 --- a/libglusterfs/src/syncop.c +++ b/libglusterfs/src/syncop.c @@ -1702,12 +1702,12 @@ syncop_rmdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this, } int -syncop_rmdir (xlator_t *subvol, loc_t *loc) +syncop_rmdir (xlator_t *subvol, loc_t *loc, int flags) { struct syncargs args = {0, }; SYNCOP (subvol, (&args), syncop_rmdir_cbk, subvol->fops->rmdir, loc, - 0, NULL); + flags, NULL); errno = args.op_errno; return args.op_ret; diff --git a/libglusterfs/src/syncop.h b/libglusterfs/src/syncop.h index 18519ff47ac..68218bb17c8 100644 --- a/libglusterfs/src/syncop.h +++ b/libglusterfs/src/syncop.h @@ -382,7 +382,7 @@ int syncop_ftruncate (xlator_t *subvol, fd_t *fd, off_t offset); int syncop_truncate (xlator_t *subvol, loc_t *loc, off_t offset); int syncop_unlink (xlator_t *subvol, loc_t *loc); -int syncop_rmdir (xlator_t *subvol, loc_t *loc); +int syncop_rmdir (xlator_t *subvol, loc_t *loc, int flags); int syncop_fsync (xlator_t *subvol, fd_t *fd, int dataonly); int syncop_flush (xlator_t *subvol, fd_t *fd); |