diff options
| author | Yan, Zheng <zheng.z.yan@intel.com> | 2012-11-19 03:49:07 +0100 |
|---|---|---|
| committer | Alex Elder <elder@inktank.com> | 2012-12-13 15:13:08 +0100 |
| commit | 0685235ffd9dbdb9ccbda587f8a3c83ad1d5a921 (patch) | |
| tree | 3a8e52d05e8e2f6ef5a270369c460588452a8f33 /fs/ceph/caps.c | |
| parent | ceph: Fix infinite loop in __wake_requests (diff) | |
| download | linux-0685235ffd9dbdb9ccbda587f8a3c83ad1d5a921.tar.xz linux-0685235ffd9dbdb9ccbda587f8a3c83ad1d5a921.zip | |
ceph: Don't add dirty inode to dirty list if caps is in migration
Add dirty inode to cap_dirty_migrating list instead, this can avoid
ceph_flush_dirty_caps() entering infinite loop.
Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
Signed-off-by: Sage Weil <sage@inktank.com>
Diffstat (limited to 'fs/ceph/caps.c')
| -rw-r--r-- | fs/ceph/caps.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c index 8072aefc427c..5efa3f5e2f77 100644 --- a/fs/ceph/caps.c +++ b/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); |