From a6c7d90c32c077915dbf3f6a5080d4e788ae67a4 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Sat, 16 Jul 2011 23:09:10 -0400 Subject: [PATCH] --- yaml --- r: 257399 b: refs/heads/master c: 10d9f309d88ca7f47133d57e99b72810f119f75b h: refs/heads/master i: 257397: 4364359bc79f95275d735aa07332c33b1edcacee 257395: 8dd15f19bb10f3983098cb3024479a951c98cc48 257391: e1839dd2c1707fc225fde65d90faa2896fbbf57d v: v3 --- [refs] | 2 +- trunk/fs/btrfs/inode.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 23067ac0b5ca..e9296d2552e9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2fbe8c8ad176db69dfc682b4abb721c8fc19c3fd +refs/heads/master: 10d9f309d88ca7f47133d57e99b72810f119f75b diff --git a/trunk/fs/btrfs/inode.c b/trunk/fs/btrfs/inode.c index bcb20a9a3b93..2548a04a0230 100644 --- a/trunk/fs/btrfs/inode.c +++ b/trunk/fs/btrfs/inode.c @@ -4766,11 +4766,10 @@ static int btrfs_link(struct dentry *old_dentry, struct inode *dir, if (err) { drop_inode = 1; } else { - struct dentry *parent = dget_parent(dentry); + struct dentry *parent = dentry->d_parent; err = btrfs_update_inode(trans, root, inode); BUG_ON(err); btrfs_log_new_name(trans, inode, NULL, parent); - dput(parent); } nr = trans->blocks_used; @@ -7062,9 +7061,8 @@ static int btrfs_rename(struct inode *old_dir, struct dentry *old_dentry, BUG_ON(ret); if (old_ino != BTRFS_FIRST_FREE_OBJECTID) { - struct dentry *parent = dget_parent(new_dentry); + struct dentry *parent = new_dentry->d_parent; btrfs_log_new_name(trans, old_inode, old_dir, parent); - dput(parent); btrfs_end_log_trans(root); } out_fail: