浏览代码

[PATCH] truncate: dirty memory accounting fix

Only (un)account for IO and page-dirtying for devices which have real backing
store (ie: not tmpfs or ramdisks).

Cc: "David S. Miller" <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Andrew Morton 18 年之前
父节点
当前提交
5f2a105d5e
共有 1 个文件被更改,包括 2 次插入1 次删除
  1. 2 1
      mm/truncate.c

+ 2 - 1
mm/truncate.c

@@ -60,7 +60,8 @@ void cancel_dirty_page(struct page *page, unsigned int account_size)
 		WARN_ON(++warncount < 5);
 		WARN_ON(++warncount < 5);
 	}
 	}
 		
 		
-	if (TestClearPageDirty(page) && account_size) {
+	if (TestClearPageDirty(page) && account_size &&
+			mapping_cap_account_dirty(page->mapping)) {
 		dec_zone_page_state(page, NR_FILE_DIRTY);
 		dec_zone_page_state(page, NR_FILE_DIRTY);
 		task_io_account_cancelled_write(account_size);
 		task_io_account_cancelled_write(account_size);
 	}
 	}