From 1fbaf0b81f1d52a44ed7941061fa3256fec03cf4 Mon Sep 17 00:00:00 2001 From: Alexander Beregalov Date: Mon, 22 Feb 2010 17:17:44 +0300 Subject: [PATCH] --- yaml --- r: 188727 b: refs/heads/master c: 4ce1e9adabbad8f2c45ceeeb6de56cc368484297 h: refs/heads/master i: 188725: feac0a64649b26139ebe1ca6cd8b0d600729347b 188723: ecc211e76da5ecb507191f9919519f8c014ab477 188719: 2b0c335521bf5aa6351f16f5ce67d253953069d6 v: v3 --- [refs] | 2 +- trunk/fs/ceph/addr.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index bb91f798b00f..118bfa9a9412 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5b3a4db3e4009aff918abb1353eb3f4925393a7b +refs/heads/master: 4ce1e9adabbad8f2c45ceeeb6de56cc368484297 diff --git a/trunk/fs/ceph/addr.c b/trunk/fs/ceph/addr.c index 25360d517d1b..23bb0ceabe31 100644 --- a/trunk/fs/ceph/addr.c +++ b/trunk/fs/ceph/addr.c @@ -144,7 +144,7 @@ static int ceph_set_page_dirty(struct page *page) */ static void ceph_invalidatepage(struct page *page, unsigned long offset) { - struct inode *inode = page->mapping->host; + struct inode *inode; struct ceph_inode_info *ci; struct ceph_snap_context *snapc = (void *)page->private; @@ -153,6 +153,8 @@ static void ceph_invalidatepage(struct page *page, unsigned long offset) BUG_ON(!PagePrivate(page)); BUG_ON(!page->mapping); + inode = page->mapping->host; + /* * We can get non-dirty pages here due to races between * set_page_dirty and truncate_complete_page; just spit out a