lkml.org 
[lkml]   [2011]   [Mar]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3/4] ceph: compensate for dentry_unhash() calls in vfs_rmdir() and vfs_rename_dir()
    Date
    The VFS unhashes the dentry prior to calling the ->rmdir and ->rename
    (directory) inode operations. This is contrary to what the ->d_prune
    d_op aims to provide: fs notification prior to dentries being unhashed.
    Because it is done under the directory i_mutex and is thus serialized
    against ->lookup() and ->readdir(), we can safely compensate by clearing
    the flag in those methods.

    Signed-off-by: Sage Weil <sage@newdream.net>
    ---
    fs/ceph/dir.c | 23 ++++++++++++++++++-----
    1 files changed, 18 insertions(+), 5 deletions(-)

    diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c
    index e2005fa..2072f62 100644
    --- a/fs/ceph/dir.c
    +++ b/fs/ceph/dir.c
    @@ -825,7 +825,7 @@ static int ceph_unlink(struct inode *dir, struct dentry *dentry)
    struct inode *inode = dentry->d_inode;
    struct ceph_mds_request *req;
    int err = -EROFS;
    - int op;
    + int op = 0;

    if (ceph_snap(dir) == CEPH_SNAPDIR) {
    /* rmdir .snap/foo is RMSNAP */
    @@ -855,6 +855,9 @@ static int ceph_unlink(struct inode *dir, struct dentry *dentry)
    d_delete(dentry);
    ceph_mdsc_put_request(req);
    out:
    + if (err && op != CEPH_MDS_OP_UNLINK)
    + /* vfs_rmdir calls dentry_unhash(), grr */
    + ceph_dir_clear_complete(dir);
    return err;
    }

    @@ -864,18 +867,24 @@ static int ceph_rename(struct inode *old_dir, struct dentry *old_dentry,
    struct ceph_fs_client *fsc = ceph_sb_to_client(old_dir->i_sb);
    struct ceph_mds_client *mdsc = fsc->mdsc;
    struct ceph_mds_request *req;
    + int is_dir = new_dentry->d_inode &&
    + (new_dentry->d_inode->i_mode & S_IFMT) == S_IFDIR;
    int err;

    + err = -EXDEV;
    if (ceph_snap(old_dir) != ceph_snap(new_dir))
    - return -EXDEV;
    + goto out;
    + err = -EROFS;
    if (ceph_snap(old_dir) != CEPH_NOSNAP ||
    ceph_snap(new_dir) != CEPH_NOSNAP)
    - return -EROFS;
    + goto out;
    dout("rename dir %p dentry %p to dir %p dentry %p\n",
    old_dir, old_dentry, new_dir, new_dentry);
    req = ceph_mdsc_create_request(mdsc, CEPH_MDS_OP_RENAME, USE_AUTH_MDS);
    - if (IS_ERR(req))
    - return PTR_ERR(req);
    + if (IS_ERR(req)) {
    + err = PTR_ERR(req);
    + goto out;
    + }
    req->r_dentry = dget(new_dentry);
    req->r_num_caps = 2;
    req->r_old_dentry = dget(old_dentry);
    @@ -906,6 +915,10 @@ static int ceph_rename(struct inode *old_dir, struct dentry *old_dentry,
    ceph_invalidate_dentry_lease(new_dentry);
    }
    ceph_mdsc_put_request(req);
    +out:
    + if (err && is_dir)
    + /* vfs_rename_dir calls dentry_unhash(), grr */
    + ceph_dir_clear_complete(new_dir);
    return err;
    }

    --
    1.7.0


    \
     
     \ /
      Last update: 2011-03-22 01:45    [W:0.031 / U:0.300 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site