From: Joel Becker <joel.becker@oracle.com>
Date: Fri, 10 Oct 2008 00:20:33 +0000 (-0700)
Subject: ocfs2: Kill the last naked wait_on_buffer() for cached reads.
X-Git-Tag: v2.6.28-rc1~572^2~1
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=5e0b3dec0107540244ba343f983ef4f972db20de;p=linux-2.6-omap-h63xx.git

ocfs2: Kill the last naked wait_on_buffer() for cached reads.

ocfs2's cached buffer I/O goes through ocfs2_read_block(s)().  dir.c had
a naked wait_on_buffer() to wait for some readahead, but it should
use ocfs2_read_block() instead.

Signed-off-by: Joel Becker <joel.becker@oracle.com>
Signed-off-by: Mark Fasheh <mfasheh@suse.com>
---

diff --git a/fs/ocfs2/dir.c b/fs/ocfs2/dir.c
index ef2bb856f73..60be3ba1f5d 100644
--- a/fs/ocfs2/dir.c
+++ b/fs/ocfs2/dir.c
@@ -302,14 +302,13 @@ restart:
 		}
 		if ((bh = bh_use[ra_ptr++]) == NULL)
 			goto next;
-		wait_on_buffer(bh);
-		if (!buffer_uptodate(bh)) {
-			/* read error, skip block & hope for the best */
+		if (ocfs2_read_block(dir, block, &bh)) {
+			/* read error, skip block & hope for the best.
+			 * ocfs2_read_block() has released the bh. */
 			ocfs2_error(dir->i_sb, "reading directory %llu, "
 				    "offset %lu\n",
 				    (unsigned long long)OCFS2_I(dir)->ip_blkno,
 				    block);
-			brelse(bh);
 			goto next;
 		}
 		i = ocfs2_search_dirblock(bh, dir, name, namelen,