X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=mm%2Fpage-writeback.c;h=efe68148f621959beb28987dd9430fff289f583f;hb=a42277c739c29b06cb27502347f557e11fed8b0e;hp=cdc377c456c0314ecdf8e20b2cdd881a2d88c814;hpb=0ca7ffb356063c5ece847687da457dfe748612a2;p=deliverable%2Flinux.git

diff --git a/mm/page-writeback.c b/mm/page-writeback.c
index cdc377c456c0..efe68148f621 100644
--- a/mm/page-writeback.c
+++ b/mm/page-writeback.c
@@ -696,7 +696,7 @@ static unsigned long bdi_position_ratio(struct backing_dev_info *bdi,
 	 *     => fast response on large errors; small oscillation near setpoint
 	 */
 	setpoint = (freerun + limit) / 2;
-	x = div_s64((setpoint - dirty) << RATELIMIT_CALC_SHIFT,
+	x = div_s64(((s64)setpoint - (s64)dirty) << RATELIMIT_CALC_SHIFT,
 		    limit - setpoint + 1);
 	pos_ratio = x;
 	pos_ratio = pos_ratio * x >> RATELIMIT_CALC_SHIFT;
@@ -1986,6 +1986,8 @@ int __set_page_dirty_no_writeback(struct page *page)
  */
 void account_page_dirtied(struct page *page, struct address_space *mapping)
 {
+	trace_writeback_dirty_page(page, mapping);
+
 	if (mapping_cap_account_dirty(mapping)) {
 		__inc_zone_page_state(page, NR_FILE_DIRTY);
 		__inc_zone_page_state(page, NR_DIRTIED);