From: Ingo Molnar Teach special (rwsem-in-irq) locking code to the lock validator. Has no effect on non-lockdep kernels. Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Cc: Russell King Signed-off-by: Andrew Morton --- fs/direct-io.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff -puN fs/direct-io.c~lock-validator-special-locking-direct-io fs/direct-io.c --- devel/fs/direct-io.c~lock-validator-special-locking-direct-io 2006-06-02 19:00:26.000000000 -0700 +++ devel-akpm/fs/direct-io.c 2006-06-02 19:00:26.000000000 -0700 @@ -220,7 +220,8 @@ static void dio_complete(struct dio *dio 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 kioc } 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); } /* _