---

yaml --- r: 188727 b: refs/heads/master c: 4ce1e9a h: refs/heads/master i: 188725: feac0a6 188723: ecc211e 188719: 2b0c335 v: v3
git-mirror · Feb 23, 2010 · 1fbaf0b · 1fbaf0b
1 parent 9a21686
commit 1fbaf0b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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