---

yaml --- r: 31811 b: refs/heads/master c: d8aa905 h: refs/heads/master i: 31809: c227343 31807: 751c8fe v: v3
git-mirror · Jul 3, 2006 · ac748fc · ac748fc
1 parent 912456c
commit ac748fc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git 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
@@ -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);
 	}
 
 	/*