Hi Dan,

On Apr 11, 2013 11:54 AM, "Dan Carpenter" <dan.carpenter@oracle.com> wrote:
>
> 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.

Best regards,
-Sumit.

>
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> ---
> This is in linux-next, and I think the debugfs code is only in Sumit's
> tree.
>
> diff --git a/drivers/base/dma-buf.c b/drivers/base/dma-buf.c
> index 466476f..174cd2c 100644
> --- a/drivers/base/dma-buf.c
> +++ b/drivers/base/dma-buf.c
> @@ -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);
>         }
>