indexed-dirs: fix brelse order in ocfs2_find_entry_dx(), v2
PATCH 1/1 indexed-dirs: fix brelse order in ocfs2_find_entry_dx(), v2
In ocfs2_find_entry_dx(), if ocfs2_read_inode_block() failed, both di_bh and dx_root_bh are both released. In this case, for dx_root_bh, it's unnecessary (even buggy if refcount of dx_root_bh is non-zero).
This patch fixes this issue by change brelse order of di_bh and dx_root_bh.
--- fs/ocfs2/dir.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-)
fs/ocfs2/dir.c +8 -6
@@ -1048,7 +1048,7 @@ static int ocfs2_find_entry_dx(const char *name, int namelen, ret =ocfs2_read_inode_block (dir, &di_bh);if (ret) {mlog_errno (ret); - goto out; + goto brelse_di; } di = (struct ocfs2_dinode *)di_bh->b_data;
@@ -1056,7 +1056,7 @@ static int ocfs2_find_entry_dx(const char *name, int namelen, ret =ocfs2_read_dx_root (dir, di, &dx_root_bh);if (ret) {mlog_errno (ret); - goto out; + goto brelse_dx_root; } dx_root = (struct ocfs2_dx_root_block *) dx_root_bh->b_data;
@@ -1064,14 +1064,16 @@ static int ocfs2_find_entry_dx(const char *name, int namelen,if (ret) {if (ret != -ENOENT )mlog_errno (ret); - goto out; + goto brelse_dx_root; } lookup->dl_dx_root_bh = dx_root_bh; - dx_root_bh =NULL ; -out: -brelse (di_bh); + goto brelse_di; + +brelse_dx_root:brelse (dx_root_bh); +brelse_di: +brelse (di_bh);return ret; }
Signature · 2 lines
Coly Li SuSE Labs
PATCH 1/1 indexed-dirs: fix brelse order in ocfs2_find_entry_dx(), v2
Coly Li Wrote:
Quoted 5 lines
In
ocfs2_find_entry_dx(), ifocfs2_read_inode_block()failed, bothdi_bhanddx_root_bhare both released. In this case, fordx_root_bh, it's unnecessary (even buggy if refcount ofdx_root_bhis non-zero).This patch fixes this issue by change brelse order of
di_bhanddx_root_bh.
Hmm, I find di_bh and dx_root_bh are initialized to NULL in ocfs2_read_inode_block(). Therefore there is no issue described in this patch. Please ignore this patch.
Thanks.
Signature · 2 lines
Coly Li SuSE Labs