diff --git a/[refs] b/[refs] index b8fba98116bb..6bfc1384ed01 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 019d1b2247c6898589560c6f3b3e7ec280b0010a +refs/heads/master: 9f70968af3e6e21612e06e153aa71c62dee5a09b diff --git a/trunk/fs/ocfs2/dcache.c b/trunk/fs/ocfs2/dcache.c index 3094ddb7a254..1957a5ed219e 100644 --- a/trunk/fs/ocfs2/dcache.c +++ b/trunk/fs/ocfs2/dcache.c @@ -318,9 +318,9 @@ int ocfs2_dentry_attach_lock(struct dentry *dentry, static void ocfs2_drop_dentry_lock(struct ocfs2_super *osb, struct ocfs2_dentry_lock *dl) { + iput(dl->dl_inode); ocfs2_simple_drop_lockres(osb, &dl->dl_lockres); ocfs2_lock_res_free(&dl->dl_lockres); - iput(dl->dl_inode); kfree(dl); }