On Sat, 27 Feb 2016, Greg KH wrote:
> On Fri, Feb 26, 2016 at 05:34:19PM -0800, Eric Wheeler wrote:
> > To whom it may concern:
> >
> > Please flag commit cbf76b702 for inclusion into stable branches. It
> > applies cleanly in 4.1 (and likely 3.18). We have been testing it for a
> > while.
> >
> > git diff --stat cbf76b702~1..cbf76b702
> > drivers/md/bcache/closure.c | 4 +---
> > 1 file changed, 1 insertion(+), 3 deletions(-)
> >
> > Thank you!
>
> $ git show cbf76b702
> fatal: ambiguous argument 'cbf76b702': unknown revision or path not in the working tree.
>
> You are going to have to be a bit more specific...
This one:
commit cbf76b702e85802683c166ad9067874bc3e1e843
Author: Petr Mladek <pmladek@xxxxxxxx>
Date: Mon Oct 5 14:39:52 2015 +0200
bcache: Really show state of work pending bit
WORK_STRUCT_PENDING is a mask for testing the pending bit.
test_bit() expects the number of the bit and we need to
use WORK_STRUCT_PENDING_BIT there.
Also work_data_bits() is defined in workqueues.h now.
I have noticed this just by chance when looking how
WORK_STRUCT_PENDING_BIT is used. The change is compile
tested.
Signed-off-by: Petr Mladek <pmladek@xxxxxxxx>
Signed-off-by: Jiri Kosina <jkosina@xxxxxxx>
diff --git a/drivers/md/bcache/closure.c b/drivers/md/bcache/closure.c
index 7a228de..9eaf1d6 100644
--- a/drivers/md/bcache/closure.c
+++ b/drivers/md/bcache/closure.c
@@ -167,8 +167,6 @@ EXPORT_SYMBOL(closure_debug_destroy);
static struct dentry *debug;
-#define work_data_bits(work) ((unsigned long *)(&(work)->data))
-
static int debug_seq_show(struct seq_file *f, void *data)
{
struct closure *cl;
@@ -182,7 +180,7 @@ static int debug_seq_show(struct seq_file *f, void *data)
r & CLOSURE_REMAINING_MASK);
seq_printf(f, "%s%s%s%s\n",
- test_bit(WORK_STRUCT_PENDING,
+ test_bit(WORK_STRUCT_PENDING_BIT,
work_data_bits(&cl->work)) ? "Q" : "",
r & CLOSURE_RUNNING ? "R" : "",
r & CLOSURE_STACK ? "S" : "",
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html