Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d8aa905b authored by Ingo Molnar's avatar Ingo Molnar Committed by Linus Torvalds
Browse files

[PATCH] lockdep: annotate direct io 



Teach special (rwsem-in-irq) locking code to the lock validator.  Has no
effect on non-lockdep kernels.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarArjan van de Ven <arjan@linux.intel.com>
Cc: Russell King <rmk@arm.linux.org.uk>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 2b105ff9

fs/direct-io.c

+4 −2
Original line number Diff line number Diff line
@@ -220,7 +220,8 @@ static void dio_complete(struct dio *dio, loff_t offset, ssize_t bytes) 
	if (dio->end_io && dio->result)

		dio->end_io(dio->iocb, offset, bytes, dio->map_bh.b_private);

	if (dio->lock_type == DIO_LOCKING)

		up_read(&dio->inode->i_alloc_sem);

		/* lockdep: non-owner release */

		up_read_non_owner(&dio->inode->i_alloc_sem);

}



/*
@@ -1261,7 +1262,8 @@ __blockdev_direct_IO(int rw, struct kiocb *iocb, struct inode *inode, 
		}



		if (dio_lock_type == DIO_LOCKING)

			down_read(&inode->i_alloc_sem);

			/* lockdep: not the owner will release it */

			down_read_non_owner(&inode->i_alloc_sem);

	}



	/*