Attachment 148182 Details for Bug 222323 – lockdep annotation

[patch] lockdep annotation

lockdep_blkpg_ioctl.patch (text/plain), 1.38 KB, created by Peter Zijlstra on 2007-02-16 10:42:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Peter Zijlstra

Created: 2007-02-16 10:42:09 UTC

Size: 1.38 KB

patch

obsolete

>
>Annotate BLKPG_DEL_PARTITION's bd_mutex locking and add a little comment
>clarifying the bd_mutex locking, because I confused myself and initially
>thought the lock order was wrong too.
>
>Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
>---
> block/ioctl.c  |    2 +-
> fs/block_dev.c |    7 +++++++
> 2 files changed, 8 insertions(+), 1 deletion(-)
>
>Index: linux-2.6.20.noarch/block/ioctl.c
>===================================================================
>--- linux-2.6.20.noarch.orig/block/ioctl.c
>+++ linux-2.6.20.noarch/block/ioctl.c
>@@ -82,7 +82,7 @@ static int blkpg_ioctl(struct block_devi
> 			fsync_bdev(bdevp);
> 			invalidate_bdev(bdevp, 0);
> 
>-			mutex_lock(&bdev->bd_mutex);
>+			mutex_lock_nested(&bdev->bd_mutex, 1);
> 			delete_partition(disk, part);
> 			mutex_unlock(&bdev->bd_mutex);
> 			mutex_unlock(&bdevp->bd_mutex);
>Index: linux-2.6.20.noarch/fs/block_dev.c
>===================================================================
>--- linux-2.6.20.noarch.orig/fs/block_dev.c
>+++ linux-2.6.20.noarch/fs/block_dev.c
>@@ -1101,6 +1101,13 @@ static int __blkdev_get(struct block_dev
> 			int for_part);
> static int __blkdev_put(struct block_device *bdev, int for_part);
> 
>+/*
>+ * bd_mutex locking:
>+ *
>+ *  mutex_lock(part->bd_mutex)
>+ *    mutex_lock_nested(whole->bd_mutex, 1)
>+ */
>+
> static int do_open(struct block_device *bdev, struct file *file, int for_part)
> {
> 	struct module *owner = NULL;

Actions: View | Diff

Attachments on bug 222323: 148182