lkml.org 
[lkml]   [2008]   [Apr]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 02/13] ecryptfs: clean up (un)lock_parent
    From: Miklos Szeredi <mszeredi@suse.cz>

    dget(dentry->d_parent) --> dget_parent(dentry)

    unlock_parent() is racy and unnecessary. Replace single caller with
    unlock_dir().

    There are several other suspect uses of ->d_parent in ecryptfs...

    Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
    ---
    fs/ecryptfs/inode.c | 13 ++++---------
    1 file changed, 4 insertions(+), 9 deletions(-)

    Index: vfs-2.6/fs/ecryptfs/inode.c
    ===================================================================
    --- vfs-2.6.orig/fs/ecryptfs/inode.c 2008-04-23 18:50:29.000000000 +0200
    +++ vfs-2.6/fs/ecryptfs/inode.c 2008-04-23 19:00:19.000000000 +0200
    @@ -37,17 +37,11 @@ static struct dentry *lock_parent(struct
    {
    struct dentry *dir;

    - dir = dget(dentry->d_parent);
    + dir = dget_parent(dentry);
    mutex_lock_nested(&(dir->d_inode->i_mutex), I_MUTEX_PARENT);
    return dir;
    }

    -static void unlock_parent(struct dentry *dentry)
    -{
    - mutex_unlock(&(dentry->d_parent->d_inode->i_mutex));
    - dput(dentry->d_parent);
    -}
    -
    static void unlock_dir(struct dentry *dir)
    {
    mutex_unlock(&dir->d_inode->i_mutex);
    @@ -426,8 +420,9 @@ static int ecryptfs_unlink(struct inode
    int rc = 0;
    struct dentry *lower_dentry = ecryptfs_dentry_to_lower(dentry);
    struct inode *lower_dir_inode = ecryptfs_inode_to_lower(dir);
    + struct dentry *lower_dir_dentry;

    - lock_parent(lower_dentry);
    + lower_dir_dentry = lock_parent(lower_dentry);
    rc = vfs_unlink(lower_dir_inode, lower_dentry);
    if (rc) {
    printk(KERN_ERR "Error in vfs_unlink; rc = [%d]\n", rc);
    @@ -439,7 +434,7 @@ static int ecryptfs_unlink(struct inode
    dentry->d_inode->i_ctime = dir->i_ctime;
    d_drop(dentry);
    out_unlock:
    - unlock_parent(lower_dentry);
    + unlock_dir(lower_dir_dentry);
    return rc;
    }

    --


    \
     
     \ /
      Last update: 2008-04-24 13:47    [W:0.036 / U:89.944 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site