From 223aa5e0b89c0d876002036cde660bf5d34c3909 Mon Sep 17 00:00:00 2001 From: Amar Tumballi Date: Wed, 13 Feb 2019 20:39:09 +0530 Subject: [PATCH 531/531] fuse: remove the duplicate FUSE_FOP calls This got introduced as part of resolving conflicts in https://code.engineering.redhat.com/gerrit/#/c/162550/3 BUG: 1676904 Change-Id: If83c5c4c3ebabb91b997681c261199c53524a6a9 Signed-off-by: Amar Tumballi Reviewed-on: https://code.engineering.redhat.com/gerrit/162920 Reviewed-by: Sunil Kumar Heggodu Gopala Acharya --- xlators/mount/fuse/src/fuse-bridge.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/xlators/mount/fuse/src/fuse-bridge.c b/xlators/mount/fuse/src/fuse-bridge.c index deaf533..175e1b8 100644 --- a/xlators/mount/fuse/src/fuse-bridge.c +++ b/xlators/mount/fuse/src/fuse-bridge.c @@ -2974,8 +2974,6 @@ fuse_lseek (xlator_t *this, fuse_in_header_t *finh, void *msg, void fuse_flush_resume (fuse_state_t *state) { - FUSE_FOP (state, fuse_err_cbk, GF_FOP_FLUSH, - flush, state->fd, state->xdata); FUSE_FOP (state, fuse_flush_cbk, GF_FOP_FLUSH, flush, state->fd, state->xdata); } -- 1.8.3.1