---

yaml --- r: 70734 b: refs/heads/master c: 1f7decf h: refs/heads/master v: v3
git-mirror · Oct 17, 2007 · 48edff3 · 48edff3
1 parent cc212be
commit 48edff3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 08d8e9749e7f0435ba4683b620e8d30d59276b4c
+refs/heads/master: 1f7decf6d9f06dac008b8d66935c0c3b18e564f9
diff --git a/trunk/fs/buffer.c b/trunk/fs/buffer.c
@@ -1730,7 +1730,6 @@ static int __block_write_full_page(struct inode *inode, struct page *page,
 		 * The page and buffer_heads can be released at any time from
 		 * here on.
 		 */
-		wbc->pages_skipped++;	/* We didn't write this page */
 	}
 	return err;
 

diff --git a/trunk/fs/xfs/linux-2.6/xfs_aops.c b/trunk/fs/xfs/linux-2.6/xfs_aops.c
@@ -402,10 +402,9 @@ xfs_start_page_writeback(
 		clear_page_dirty_for_io(page);
 	set_page_writeback(page);
 	unlock_page(page);
-	if (!buffers) {
+	/* If no buffers on the page are to be written, finish it here */
+	if (!buffers)
 		end_page_writeback(page);
-		wbc->pages_skipped++;	/* We didn't write this page */
-	}
 }
 
 static inline int bio_add_buffer(struct bio *bio, struct buffer_head *bh)