From c86455016380a5337e3dde426fcd7880c975ceb1 Mon Sep 17 00:00:00 2001 From: "Yan, Zheng" Date: Mon, 19 Nov 2012 10:49:07 +0800 Subject: [PATCH] --- yaml --- r: 347606 b: refs/heads/master c: 0685235ffd9dbdb9ccbda587f8a3c83ad1d5a921 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/ceph/caps.c | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 81833c8fa1a4..1b334e8f5da1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ed75ec2cd19b47efcd292b6e23f58e56f4c5bc34 +refs/heads/master: 0685235ffd9dbdb9ccbda587f8a3c83ad1d5a921 diff --git a/trunk/fs/ceph/caps.c b/trunk/fs/ceph/caps.c index 8072aefc427c..5efa3f5e2f77 100644 --- a/trunk/fs/ceph/caps.c +++ b/trunk/fs/ceph/caps.c @@ -1351,11 +1351,15 @@ int __ceph_mark_dirty_caps(struct ceph_inode_info *ci, int mask) if (!ci->i_head_snapc) ci->i_head_snapc = ceph_get_snap_context( ci->i_snap_realm->cached_context); - dout(" inode %p now dirty snapc %p\n", &ci->vfs_inode, - ci->i_head_snapc); + dout(" inode %p now dirty snapc %p auth cap %p\n", + &ci->vfs_inode, ci->i_head_snapc, ci->i_auth_cap); BUG_ON(!list_empty(&ci->i_dirty_item)); spin_lock(&mdsc->cap_dirty_lock); - list_add(&ci->i_dirty_item, &mdsc->cap_dirty); + if (ci->i_auth_cap) + list_add(&ci->i_dirty_item, &mdsc->cap_dirty); + else + list_add(&ci->i_dirty_item, + &mdsc->cap_dirty_migrating); spin_unlock(&mdsc->cap_dirty_lock); if (ci->i_flushing_caps == 0) { ihold(inode);