diff options
| author | Raghavendra G <raghavendra@gluster.com> | 2012-03-29 11:21:07 +0530 |
|---|---|---|
| committer | Vijay Bellur <vijay@gluster.com> | 2012-03-28 23:02:52 -0700 |
| commit | fbfb4d48491b160436e6ac986057a8fe5e320502 (patch) | |
| tree | 7955a8e7971fe1adb7fec2361955256c25cadcd2 | |
| parent | 864c9b612a5965a0934dcbdc51f84018d27c2c80 (diff) | |
performance/quick-read: fix build errors.
Change-Id: I8c4781bdd6c3cfd50cff95c31ecd6d653b916ac3
BUG: 765363
Signed-off-by: Raghavendra G <raghavendra@gluster.com>
Reviewed-on: http://review.gluster.com/3028
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Vijay Bellur <vijay@gluster.com>
| -rw-r--r-- | xlators/performance/quick-read/src/quick-read.c | 21 | ||||
| -rw-r--r-- | xlators/performance/quick-read/src/quick-read.h | 1 |
2 files changed, 13 insertions, 9 deletions
diff --git a/xlators/performance/quick-read/src/quick-read.c b/xlators/performance/quick-read/src/quick-read.c index dae9f1456c8..dfe13997afa 100644 --- a/xlators/performance/quick-read/src/quick-read.c +++ b/xlators/performance/quick-read/src/quick-read.c @@ -3197,16 +3197,17 @@ out: int32_t qr_unlink_cbk (call_frame_t *frame, void *cookie, xlator_t *this, int32_t op_ret, int32_t op_errno, struct iatt *preparent, - struct iatt *postparent) + struct iatt *postparent, dict_t *xdata) { QR_STACK_UNWIND (unlink, frame, op_ret, op_errno, preparent, - postparent); + postparent, xdata); return 0; } int32_t -qr_unlink_helper (call_frame_t *frame, xlator_t *this, loc_t *loc) +qr_unlink_helper (call_frame_t *frame, xlator_t *this, loc_t *loc, int xflag, + dict_t *xdata) { qr_local_t *local = NULL; uint32_t open_count = 0; @@ -3229,7 +3230,7 @@ qr_unlink_helper (call_frame_t *frame, xlator_t *this, loc_t *loc) } STACK_WIND (frame, qr_unlink_cbk, FIRST_CHILD(this), - FIRST_CHILD(this)->fops->unlink, loc); + FIRST_CHILD(this)->fops->unlink, loc, xflag, xdata); out: return 0; @@ -3237,7 +3238,8 @@ out: int32_t -qr_unlink (call_frame_t *frame, xlator_t *this, loc_t *loc) +qr_unlink (call_frame_t *frame, xlator_t *this, loc_t *loc, int xflag, + dict_t *xdata) { qr_dentry_t *dentry = NULL; int32_t op_errno = -1, ret = -1, op_ret = -1; @@ -3317,7 +3319,8 @@ qr_unlink (call_frame_t *frame, xlator_t *this, loc_t *loc) if (!fdctx->opened) { stub = fop_unlink_stub (frame, qr_unlink_helper, - loc); + loc, xflag, + xdata); if (stub == NULL) { op_ret = -1; op_errno = ENOMEM; @@ -3371,18 +3374,18 @@ qr_unlink (call_frame_t *frame, xlator_t *this, loc_t *loc) STACK_WIND (open_frame, qr_open_cbk, FIRST_CHILD(this), FIRST_CHILD(this)->fops->open, - loc, fdctx->flags, fdctx->fd, fdctx->wbflags); + loc, fdctx->flags, fdctx->fd, fdctx->xdata); } return 0; unwind: - QR_STACK_UNWIND (unlink, frame, -1, op_errno, NULL, NULL); + QR_STACK_UNWIND (unlink, frame, -1, op_errno, NULL, NULL, NULL); return 0; wind: STACK_WIND (frame, qr_unlink_cbk, FIRST_CHILD(this), - FIRST_CHILD(this)->fops->unlink, loc); + FIRST_CHILD(this)->fops->unlink, loc, xflag, xdata); return 0; } diff --git a/xlators/performance/quick-read/src/quick-read.h b/xlators/performance/quick-read/src/quick-read.h index 95bd62eda45..6058d523b63 100644 --- a/xlators/performance/quick-read/src/quick-read.h +++ b/xlators/performance/quick-read/src/quick-read.h @@ -55,6 +55,7 @@ struct qr_fd_ctx { struct list_head inode_list; struct list_head tmp_list; fd_t *fd; + dict_t *xdata; }; typedef struct qr_fd_ctx qr_fd_ctx_t; |