diff options
| author | Anand V. Avati <avati@amp.gluster.com> | 2010-10-02 11:25:05 +0000 |
|---|---|---|
| committer | Vijay Bellur <vijay@dev.gluster.com> | 2010-10-02 22:18:56 -0700 |
| commit | 99caede76b0ef312d622b2387bf9524724e7c6df (patch) | |
| tree | 7b6c8cc969b5e8460e4ac4b67734422e3fad782c /xlators/cluster/afr | |
| parent | 5a4e1e69b2ec65dcefa6b37b8ac7d058f3a2c29f (diff) | |
rmdir: introduce extra flags parameter in FOP prototype
Signed-off-by: Anand V. Avati <avati@amp.gluster.com>
Signed-off-by: Vijay Bellur <vijay@dev.gluster.com>
BUG: 971 (dynamic volume management)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=971
Diffstat (limited to 'xlators/cluster/afr')
| -rw-r--r-- | xlators/cluster/afr/src/afr-dir-write.c | 5 | ||||
| -rw-r--r-- | xlators/cluster/afr/src/afr-dir-write.h | 2 | ||||
| -rw-r--r-- | xlators/cluster/afr/src/afr.h | 1 | ||||
| -rw-r--r-- | xlators/cluster/afr/src/pump.c | 17 |
4 files changed, 14 insertions, 11 deletions
diff --git a/xlators/cluster/afr/src/afr-dir-write.c b/xlators/cluster/afr/src/afr-dir-write.c index 1aa268f66e4..1226285f777 100644 --- a/xlators/cluster/afr/src/afr-dir-write.c +++ b/xlators/cluster/afr/src/afr-dir-write.c @@ -1900,7 +1900,7 @@ afr_rmdir_wind (call_frame_t *frame, xlator_t *this) (void *) (long) i, priv->children[i], priv->children[i]->fops->rmdir, - &local->loc); + &local->loc, local->cont.rmdir.flags); if (!--call_count) break; @@ -1926,7 +1926,7 @@ afr_rmdir_done (call_frame_t *frame, xlator_t *this) int afr_rmdir (call_frame_t *frame, xlator_t *this, - loc_t *loc) + loc_t *loc, int flags) { afr_private_t * priv = NULL; afr_local_t * local = NULL; @@ -1960,6 +1960,7 @@ afr_rmdir (call_frame_t *frame, xlator_t *this, transaction_frame->local = local; + local->cont.rmdir.flags = flags; loc_copy (&local->loc, loc); if (loc->parent) diff --git a/xlators/cluster/afr/src/afr-dir-write.h b/xlators/cluster/afr/src/afr-dir-write.h index e2ed8c759d0..40aeb1f5850 100644 --- a/xlators/cluster/afr/src/afr-dir-write.h +++ b/xlators/cluster/afr/src/afr-dir-write.h @@ -39,7 +39,7 @@ afr_unlink (call_frame_t *frame, xlator_t *this, int32_t afr_rmdir (call_frame_t *frame, xlator_t *this, - loc_t *loc); + loc_t *loc, int flags); int32_t afr_link (call_frame_t *frame, xlator_t *this, diff --git a/xlators/cluster/afr/src/afr.h b/xlators/cluster/afr/src/afr.h index ed50fdfbfd2..56a5fb106c3 100644 --- a/xlators/cluster/afr/src/afr.h +++ b/xlators/cluster/afr/src/afr.h @@ -531,6 +531,7 @@ typedef struct _afr_local { } unlink; struct { + int flags; ino_t parent_ino; int32_t op_ret; int32_t op_errno; diff --git a/xlators/cluster/afr/src/pump.c b/xlators/cluster/afr/src/pump.c index 1a9277abc9b..39de7cbb9ba 100644 --- a/xlators/cluster/afr/src/pump.c +++ b/xlators/cluster/afr/src/pump.c @@ -1719,22 +1719,23 @@ pump_unlink (call_frame_t *frame, } -static int32_t -pump_rmdir (call_frame_t *frame, - xlator_t *this, - loc_t *loc) +static int +pump_rmdir (call_frame_t *frame, xlator_t *this, + loc_t *loc, int flags) { afr_private_t *priv = NULL; + priv = this->private; + if (!priv->use_afr_in_pump) { - STACK_WIND (frame, - default_rmdir_cbk, + STACK_WIND (frame, default_rmdir_cbk, FIRST_CHILD(this), FIRST_CHILD(this)->fops->rmdir, - loc); + loc, flags); return 0; } - afr_rmdir (frame, this, loc); + + afr_rmdir (frame, this, loc, flags); return 0; } |