From ac748fcfa555573aea1ad3a3ae8679e32b00667b Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Mon, 3 Jul 2006 00:25:02 -0700 Subject: [PATCH] --- yaml --- r: 31811 b: refs/heads/master c: d8aa905b429700e8b6b6b301a8ac2d4a24f2c19b h: refs/heads/master i: 31809: c22734384293dfd316d34f6016a8bfe4e0a1cda6 31807: 751c8fe3e201192bd7ade00fba0d6d8be5394a8d v: v3 --- [refs] | 2 +- trunk/fs/direct-io.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c126de10a9d0..4b252b3bc67e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2b105ff9cccea5533ad518bb37dc9b43a322f7b1 +refs/heads/master: d8aa905b429700e8b6b6b301a8ac2d4a24f2c19b diff --git a/trunk/fs/direct-io.c b/trunk/fs/direct-io.c index 538fb0418fba..5981e17f46f0 100644 --- a/trunk/fs/direct-io.c +++ b/trunk/fs/direct-io.c @@ -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); } /*