aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ocfs2/dcache.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/ocfs2/dcache.c')
-rw-r--r--fs/ocfs2/dcache.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/ocfs2/dcache.c b/fs/ocfs2/dcache.c
index 09efe240e652..18a31906316e 100644
--- a/fs/ocfs2/dcache.c
+++ b/fs/ocfs2/dcache.c
@@ -414,7 +414,7 @@ void ocfs2_dentry_move(struct dentry *dentry, struct dentry *target,
414 * XXX: Is there any advantage to dropping the lock here? 414 * XXX: Is there any advantage to dropping the lock here?
415 */ 415 */
416 if (old_dir == new_dir) 416 if (old_dir == new_dir)
417 return; 417 goto out_move;
418 418
419 ocfs2_dentry_lock_put(osb, dentry->d_fsdata); 419 ocfs2_dentry_lock_put(osb, dentry->d_fsdata);
420 420
@@ -423,6 +423,9 @@ void ocfs2_dentry_move(struct dentry *dentry, struct dentry *target,
423 OCFS2_I(new_dir)->ip_blkno, 0); 423 OCFS2_I(new_dir)->ip_blkno, 0);
424 if (ret) 424 if (ret)
425 mlog_errno(ret); 425 mlog_errno(ret);
426
427out_move:
428 d_move(dentry, target);
426} 429}
427 430
428struct dentry_operations ocfs2_dentry_ops = { 431struct dentry_operations ocfs2_dentry_ops = {