commit bf26a663da9e541c910b7565bfbb9b6d45f51f7e
parent d2753c418814da4da5b26e5d701ba6f83944fa5e
Author: Oswald Buddenhagen <ossi@users.sf.net>
Date: Thu, 29 Sep 2005 21:05:05 +0000
don't call the driver's set_flags() if the flags did not change at all.
Diffstat:
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/sync.c b/src/sync.c
@@ -351,7 +351,7 @@ sync_old( int tops, store_t *sctx, store_t *tctx, store_conf_t *tconf, FILE *jfp
aflags &= F_DELETED;
dflags = 0;
}
- switch (tdriver->set_flags( tctx, tmsg, tuid, aflags, dflags )) {
+ switch ((aflags | dflags) ? tdriver->set_flags( tctx, tmsg, tuid, aflags, dflags ) : DRV_OK) {
case DRV_STORE_BAD: return pull ? SYNC_SLAVE_BAD : SYNC_MASTER_BAD;
case DRV_BOX_BAD: return SYNC_FAIL;
default: /* ok */ break;
@@ -844,7 +844,7 @@ sync_boxes( store_t *mctx, const char *mname,
nflags = srec->flags;
if ((ret = sync_old( chan->mops, sctx, mctx, chan->master, jfp, 0, &nflags, srec, smsg, mmsg, dels, delm )) != SYNC_OK ||
- (ret = sync_old( chan->sops, mctx, sctx, chan->slave, jfp, 1, &nflags, srec, mmsg, smsg, delm, dels )) != SYNC_OK)
+ (ret = sync_old( chan->sops, mctx, sctx, chan->slave, jfp, 1, &nflags, srec, mmsg, smsg, delm, dels )) != SYNC_OK)
goto finish;
if (srec->flags != nflags) {