lkml.org 
[lkml]   [2013]   [Jan]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[ 215/221] ceph: Dont add dirty inode to dirty list if caps is in migration
    Date
    3.7-stable review patch.  If anyone has any objections, please let me know.

    ------------------


    From: "Yan, Zheng" <zheng.z.yan@intel.com>

    (cherry picked from commit 0685235ffd9dbdb9ccbda587f8a3c83ad1d5a921)

    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>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    fs/ceph/caps.c | 10 +++++++---
    1 file changed, 7 insertions(+), 3 deletions(-)

    --- a/fs/ceph/caps.c
    +++ b/fs/ceph/caps.c
    @@ -1349,11 +1349,15 @@ int __ceph_mark_dirty_caps(struct ceph_i
    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);



    \
     
     \ /
      Last update: 2013-01-16 04:41    [W:2.631 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site