---

yaml --- r: 210873 b: refs/heads/master c: cfc0bf6 h: refs/heads/master i: 210871: 8a13132 v: v3
git-mirror · Sep 14, 2010 · bcd6ae4 · bcd6ae4
1 parent 403ea58
commit bcd6ae4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8bef9239ee1a42eb37d3f83bacf6a75f019c028d
+refs/heads/master: cfc0bf6640dfd0f43bf8bfec5a475284809baa4d
diff --git a/trunk/fs/ceph/caps.c b/trunk/fs/ceph/caps.c
@@ -1227,7 +1227,7 @@ void __ceph_flush_snaps(struct ceph_inode_info *ci,
 		 * pages to be written out.
 		 */
 		if (capsnap->dirty_pages || capsnap->writing)
-			continue;
+			break;
 
 		/*
 		 * if cap writeback already occurred, we should have dropped
@@ -1276,8 +1276,8 @@ void __ceph_flush_snaps(struct ceph_inode_info *ci,
 			      &session->s_cap_snaps_flushing);
 		spin_unlock(&inode->i_lock);
 
-		dout("flush_snaps %p cap_snap %p follows %lld size %llu\n",
-		     inode, capsnap, next_follows, capsnap->size);
+		dout("flush_snaps %p cap_snap %p follows %lld tid %llu\n",
+		     inode, capsnap, capsnap->follows, capsnap->flush_tid);
 		send_cap_msg(session, ceph_vino(inode).ino, 0,
 			     CEPH_CAP_OP_FLUSHSNAP, capsnap->issued, 0,
 			     capsnap->dirty, 0, capsnap->flush_tid, 0, mseq,