leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] lockdep: annotate direct io

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

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
Cc: Russell King <rmk@arm.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Ingo Molnar 2006-07-03 00:25:02 -07:00 committed by Linus Torvalds
parent 2b105ff9cc
commit d8aa905b42
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fs/direct-io.c
View File

@ -220,7 +220,8 @@ static void dio_complete(struct dio *dio, loff_t offset, ssize_t bytes)
if (dio->end_io && dio->result) if (dio->end_io && dio->result)
dio->end_io(dio->iocb, offset, bytes, dio->map_bh.b_private); dio->end_io(dio->iocb, offset, bytes, dio->map_bh.b_private);
if (dio->lock_type == DIO_LOCKING) 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) 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);
} }
/* /*