From: Joseph Fernandes Date: Mon, 9 Nov 2015 15:06:11 +0000 (+0530) Subject: tier/ctr: ignoring bitrot scrubber fops X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=d025d954a5c593ccb0838788e165c36cb3537b25;p=obnox%2Fglusterfs.git tier/ctr: ignoring bitrot scrubber fops We had missed adding GF_CLIENT_PID_SCRUB to the internal fops list of bitrot. Doing that in this fix Change-Id: I0c7de37e2bf625fb577a32a599a885ee95f5d3bd BUG: 1278326 Signed-off-by: Joseph Fernandes Reviewed-on: http://review.gluster.org/12555 Tested-by: Gluster Build System Reviewed-by: Venky Shankar Reviewed-by: Dan Lambright Tested-by: Dan Lambright --- diff --git a/xlators/features/changetimerecorder/src/ctr-helper.h b/xlators/features/changetimerecorder/src/ctr-helper.h index 1cdf3200c..5599bdd42 100644 --- a/xlators/features/changetimerecorder/src/ctr-helper.h +++ b/xlators/features/changetimerecorder/src/ctr-helper.h @@ -255,7 +255,8 @@ do {\ * If a bitrot fop * */ #define BITROT_FOP(frame)\ - (frame->root->pid == GF_CLIENT_PID_BITD) + (frame->root->pid == GF_CLIENT_PID_BITD ||\ + frame->root->pid == GF_CLIENT_PID_SCRUB) /*