Skip to contentSkip to conversation

io-accounting: write-cancel accounting

PATCH In review [email protected] 1 participant 1 message Dec 8, 2006

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 4/13 io-accounting: write-cancel accounting

From: Andrew Morton <[email protected]>

Account for the number of byte writes which this process caused to not happen after all.

Cc Jay Lan <[email protected]>
Cc Shailabh Nagar <[email protected]>
Cc Balbir Singh <[email protected]>
Cc Chris Sturtivant <[email protected]>
Cc Tony Ernst <[email protected]>
Cc Guillaume Thouvenin <[email protected]>
Cc David Wright <[email protected]>

---

 fs/buffer.c   |    7 ++++++-
 mm/truncate.c |    4 +++-
 2 files changed, 9 insertions(+), 2 deletions(-)
fs/buffer.c renamed from fs/buffer.c~io-accounting-write-cancel-accounting +6 -1
diff -puN fs/buffer.c~io-accounting-write-cancel-accounting fs/buffer.c
@@ -2823,8 +2823,13 @@ int try_to_free_buffers(struct page *pag
 		 * could encounter a non-uptodate page, which is unresolvable.
 		 * This only applies in the rare case where try_to_free_buffers
 		 * succeeds but the page is not freed.
+		 *
+		 * Also, during truncate, discard_buffer will have marked all
+		 * the page's buffers clean.  We discover that here and clean
+		 * the page also.
 		 */
-		clear_page_dirty(page);
+		if (test_clear_page_dirty(page))
+			task_io_account_cancelled_write(PAGE_CACHE_SIZE);
 	}
 out:
 	if (buffers_to_free) {
mm/truncate.c renamed from mm/truncate.c~io-accounting-write-cancel-accounting +3 -1
diff -puN mm/truncate.c~io-accounting-write-cancel-accounting mm/truncate.c
@@ -13,6 +13,7 @@
 #include <linux/module.h>
 #include <linux/pagemap.h>
 #include <linux/pagevec.h>
+#include <linux/task_io_accounting_ops.h>
 #include <linux/buffer_head.h>	/* grr. try_to_release_page,
 				   do_invalidatepage */
 
@@ -69,7 +70,8 @@ truncate_complete_page(struct address_sp
 	if (PagePrivate(page))
 		do_invalidatepage(page, 0);
 
-	clear_page_dirty(page);
+	if (test_clear_page_dirty(page))
+		task_io_account_cancelled_write(PAGE_CACHE_SIZE);
 	ClearPageUptodate(page);
 	ClearPageMappedToDisk(page);
 	remove_from_page_cache(page);

_