dma-buf: double unlock in debugfs code

PATCH In review Dan Carpenter 2 participants 4 messages Apr 11, 2013 – Apr 12, 2013 1 message not in the archive

Subsystems (2)

Kernel janitors Driver core

lore

Share & tools

lore

Dan Carpenter

author

2013-04-11 06:23 UTC #0 lore raw

PATCH 1/2 dma-buf: double unlock in debugfs code

We unlock here when we failed to take the lock.

Signed-off-by Dan Carpenter <[email protected]>

---
This is in linux-next, and I think the debugfs code is only in Sumit's tree.

drivers/base/dma-buf.c +1 -2

index 466476f..174cd2c 100644
@@ -593,7 +593,7 @@ static int dma_buf_describe(struct seq_file *s)
 		if (ret) {
 			seq_printf(s,
 				  "\tERROR locking buffer object: skipping\n");
-			goto skip_buffer;
+			continue;
 		}
 
 		seq_printf(s, "\t");

@@ -618,7 +618,6 @@ static int dma_buf_describe(struct seq_file *s)
 
 		count++;
 		size += buf_obj->size;
-skip_buffer:
 		mutex_unlock(&buf_obj->lock);
 	}

Dan Carpenter

author

2013-04-11 06:27 UTC #1 lore raw

Oops... I mailed that prematurely. There isn't a [patch 2/2].

regards,
dan carpenter

Greg Kroah-Hartman

maintainer Acked-by on v1 1/2

2013-04-11 19:40 UTC #2 lore raw

In reply to Dan Carpenter

Quoted 6 lines · Dan Carpenter

We unlock here when we failed to take the lock.
Signed-off-by Dan Carpenter <[email protected]>
---
This is in linux-next, and I think the debugfs code is only in Sumit's tree.

Yes, it's not in mine, so I can't take this, sorry. Sumit, please apply this:

Acked-by Greg Kroah-Hartman <[email protected]>

A message that is not in the archive (sent off-list or not yet received): CAO_48GHvAUmVmmZyHiEXzN3nWtTjC9iz-hEo-z3GrR2T-LZ-0w@mail.gmail.com

Dan Carpenter

author

2013-04-12 05:59 UTC #4 lore raw

Quoted 9 lines · Sumit Semwal

Hi Dan,
Quoted 2 lines · Dan Carpenter
We unlock here when we failed to take the lock.
Thanks for catching this; I will add it to the for-next queue.
Could I merge this change with the main patch while submitting to mainline? With an attribution to you, of course.

Yeah. Just merge it. Don't stress about attribution.

regards,
dan carpenter