aboutsummaryrefslogtreecommitdiffstats
path: root/fs/xfs/linux-2.6/xfs_aops.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-03-03 12:16:03 -0500
committerJeff Garzik <jeff@garzik.org>2006-03-03 12:16:03 -0500
commit801c63c38ae52e8bfb3f6518de00a0be22c55f9a (patch)
treebb7b9539f2f2b8077a04c2df3b60ac8cc8fa692d /fs/xfs/linux-2.6/xfs_aops.c
parent1ed82ae3df3882bfcb5bfe5e9f97e4e8e23af299 (diff)
parent348edc59a8f9b9a66700781d972c24a46a79ae86 (diff)
Merge branch 'upstream'
Diffstat (limited to 'fs/xfs/linux-2.6/xfs_aops.c')
-rw-r--r--fs/xfs/linux-2.6/xfs_aops.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/linux-2.6/xfs_aops.c b/fs/xfs/linux-2.6/xfs_aops.c
index 8f2beec526cf..74d8be87f983 100644
--- a/fs/xfs/linux-2.6/xfs_aops.c
+++ b/fs/xfs/linux-2.6/xfs_aops.c
@@ -540,7 +540,7 @@ xfs_probe_cluster(
540 540
541 /* First sum forwards in this page */ 541 /* First sum forwards in this page */
542 do { 542 do {
543 if (mapped != buffer_mapped(bh)) 543 if (!buffer_uptodate(bh) || (mapped != buffer_mapped(bh)))
544 return total; 544 return total;
545 total += bh->b_size; 545 total += bh->b_size;
546 } while ((bh = bh->b_this_page) != head); 546 } while ((bh = bh->b_this_page) != head);