From eb4ea14dcdf6dc2f741a2ed14150ee6ea83b92ce Mon Sep 17 00:00:00 2001 From: Zhou Zhengping Date: Sat, 16 Jul 2016 18:02:55 -0400 Subject: io-threads.c: add serveral fops support in io-threads 1.add lease, seek, getactivelk, setactivelk support in io-threads 2.add several missing function declations in defaults.h, the declation of function default_getactivelk_failure_cbk needed by io-threads.c Signed-off-by: Zhou Zhengping Change-Id: Ie7a56569b4c29cdc6984d31738b484d2d6d83557 BUG: 1357210 Reviewed-on: http://review.gluster.org/14935 Tested-by: Zhou Zhengping NetBSD-regression: NetBSD Build System CentOS-regression: Gluster Build System Reviewed-by: Niels de Vos Smoke: Gluster Build System Reviewed-by: Jeff Darcy --- libglusterfs/src/defaults.h | 51 +++++++++++++++++++++++++++++++++++---------- 1 file changed, 40 insertions(+), 11 deletions(-) (limited to 'libglusterfs') diff --git a/libglusterfs/src/defaults.h b/libglusterfs/src/defaults.h index 2fc6a46de1f..50f1909b90b 100644 --- a/libglusterfs/src/defaults.h +++ b/libglusterfs/src/defaults.h @@ -591,6 +591,14 @@ int32_t default_seek_resume (call_frame_t *frame, xlator_t *this, fd_t *fd, int32_t default_lease_resume (call_frame_t *frame, xlator_t *this, loc_t *loc, struct gf_lease *lease, dict_t *xdata); +int32_t +default_getactivelk_resume (call_frame_t *frame, xlator_t *this, loc_t *loc, + dict_t *xdata); + +int32_t +default_setactivelk_resume (call_frame_t *frame, xlator_t *this, loc_t *loc, + lock_migration_info_t *locklist, dict_t *xdata); + /* _cbk_resume */ int32_t @@ -856,6 +864,14 @@ int32_t default_zerofill_cbk_resume (call_frame_t * frame, void *cookie, xlator_t * this, int32_t op_ret, int32_t op_errno, struct iatt *pre, struct iatt *post, dict_t * xdata); +int32_t +default_ipc_cbk_resume (call_frame_t *frame, void *cookie, xlator_t *this, + int32_t op_ret, int32_t op_errno, dict_t *xdata); + +int32_t +default_seek_cbk_resume (call_frame_t *frame, void *cookie, xlator_t *this, + int32_t op_ret, int32_t op_errno, off_t offset, + dict_t *xdata); int32_t default_getspec_cbk_resume (call_frame_t * frame, void *cookie, @@ -868,13 +884,16 @@ default_lease_cbk_resume (call_frame_t *frame, void *cookie, xlator_t *this, struct gf_lease *lease, dict_t *xdata); int32_t -default_getactivelk_resume (call_frame_t *frame, xlator_t *this, loc_t *loc, - dict_t *xdata); +default_getactivelk_cbk_resume (call_frame_t *frame, void *cookie, + xlator_t *this, int32_t op_ret, + int32_t op_errno, + lock_migration_info_t *locklist, + dict_t *xdata); int32_t -default_setactivelk_resume (call_frame_t *frame, xlator_t *this, loc_t *loc, - lock_migration_info_t *locklist, dict_t *xdata); - +default_setactivelk_cbk_resume (call_frame_t *frame, void *cookie, + xlator_t *this, int32_t op_ret, + int32_t op_errno, dict_t *xdata); /* _CBK */ int32_t @@ -1113,6 +1132,17 @@ default_lease_cbk (call_frame_t *frame, void *cookie, xlator_t *this, int32_t op_ret, int32_t op_errno, struct gf_lease *lease, dict_t *xdata); +int32_t +default_getactivelk_cbk (call_frame_t *frame, void *cookie, xlator_t *this, + int32_t op_ret, int32_t op_errno, + lock_migration_info_t *locklist, + dict_t *xdata); + +int32_t +default_setactivelk_cbk (call_frame_t *frame, void *cookie, xlator_t *this, + int32_t op_ret, int32_t op_errno, dict_t *xdata); + + int32_t default_lookup_failure_cbk (call_frame_t *frame, int32_t op_errno); @@ -1250,6 +1280,9 @@ default_zerofill_failure_cbk (call_frame_t *frame, int32_t op_errno); int32_t default_getspec_failure_cbk (call_frame_t *frame, int32_t op_errno); +int32_t +default_ipc_failure_cbk (call_frame_t *frame, int32_t op_errno); + int32_t default_seek_failure_cbk (call_frame_t *frame, int32_t op_errno); @@ -1257,14 +1290,10 @@ int32_t default_lease_failure_cbk (call_frame_t *frame, int32_t op_errno); int32_t -default_getactivelk_cbk (call_frame_t *frame, void *cookie, xlator_t *this, - int32_t op_ret, int32_t op_errno, - lock_migration_info_t *locklist, - dict_t *xdata); +default_getactivelk_failure_cbk (call_frame_t *frame, int32_t op_errno); int32_t -default_setactivelk_cbk (call_frame_t *frame, void *cookie, xlator_t *this, - int32_t op_ret, int32_t op_errno, dict_t *xdata); +default_setactivelk_failure_cbk (call_frame_t *frame, int32_t op_errno); int32_t default_mem_acct_init (xlator_t *this); -- cgit