diff --git a/[refs] b/[refs] index f55568d816fc..51ffc85ab45c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cfc069d3fa24d7c6357e3b731e97f94db495bf0c +refs/heads/master: 1e6d9153df27923649976554d034a69ac7b28f95 diff --git a/trunk/fs/ocfs2/namei.c b/trunk/fs/ocfs2/namei.c index ff5744e1e36f..ca35f81a13bb 100644 --- a/trunk/fs/ocfs2/namei.c +++ b/trunk/fs/ocfs2/namei.c @@ -1017,8 +1017,11 @@ static int ocfs2_double_lock(struct ocfs2_super *osb, * An error return must mean that no cluster locks * were held on function exit. */ - if (oi1->ip_blkno != oi2->ip_blkno) + if (oi1->ip_blkno != oi2->ip_blkno) { ocfs2_inode_unlock(inode2, 1); + brelse(*bh2); + *bh2 = NULL; + } if (status != -ENOENT) mlog_errno(status);