path: root/mm
diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2010-08-28 14:07:20 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-28 14:07:20 -0700
commit997396a73a94de7d92d82e30d7bb1d931e38cb16 (patch)
tree2190a66e085f16a1985e008be167d6fc4ea6734d /mm
parent6f4dbeca1a5bac4552d49d9e7b774da9f6625e74 (diff)
parentb545787dbb00a041c541a4759d938ddb0108295a (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: ceph: fix get_ticket_handler() error handling ceph: don't BUG on ENOMEM during mds reconnect ceph: ceph_mdsc_build_path() returns an ERR_PTR ceph: Fix warnings ceph: ceph_get_inode() returns an ERR_PTR ceph: initialize fields on new dentry_infos ceph: maintain i_head_snapc when any caps are dirty, not just for data ceph: fix osd request lru adjustment when sending request ceph: don't improperly set dir complete when holding EXCL cap mm: exporting account_page_dirty ceph: direct requests in snapped namespace based on nonsnap parent ceph: queue cap snap writeback for realm children on snap update ceph: include dirty xattrs state in snapped caps ceph: fix xattr cap writeback ceph: fix multiple mds session shutdown
Diffstat (limited to 'mm')
1 files changed, 1 insertions, 0 deletions
diff --git a/mm/page-writeback.c b/mm/page-writeback.c
index a803f5e3347..e3bccac1f02 100644
--- a/mm/page-writeback.c
+++ b/mm/page-writeback.c
@@ -1126,6 +1126,7 @@ void account_page_dirtied(struct page *page, struct address_space *mapping)
* For address_spaces which do not use buffers. Just tag the page as dirty in