hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ocfs2: use retval instead of status for checking error 

The use of 'status' in __ocfs2_add_entry() can return wrong value.

Some functions' return value in __ocfs2_add_entry(), i.e
ocfs2_journal_access_di() is saved to 'status'.  But 'status' is not
used in 'bail' label for returning result of __ocfs2_add_entry().

So use retval instead of status.

Signed-off-by: Daeseok Youn <daeseok.youn@gmail.com>
Reviewed-by: Joseph Qi <joseph.qi@huawei.com>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Mark Fasheh <mfasheh@suse.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Daeseok Youn 2015-06-24 16:55:01 -07:00 committed by Linus Torvalds
parent cf1776a9e8
commit 2e17315242
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
fs/ocfs2/dir.c
View File

@ -1617,7 +1617,7 @@ int __ocfs2_add_entry(handle_t *handle,
struct ocfs2_dir_entry *de, *de1; struct ocfs2_dir_entry *de, *de1;
struct ocfs2_dinode *di = (struct ocfs2_dinode *)parent_fe_bh->b_data; struct ocfs2_dinode *di = (struct ocfs2_dinode *)parent_fe_bh->b_data;
struct super_block *sb = dir->i_sb; struct super_block *sb = dir->i_sb;
int retval, status; int retval;
unsigned int size = sb->s_blocksize; unsigned int size = sb->s_blocksize;
struct buffer_head *insert_bh = lookup->dl_leaf_bh; struct buffer_head *insert_bh = lookup->dl_leaf_bh;
char *data_start = insert_bh->b_data; char *data_start = insert_bh->b_data;
@ -1695,25 +1695,25 @@ int __ocfs2_add_entry(handle_t *handle,
} }
if (insert_bh == parent_fe_bh) if (insert_bh == parent_fe_bh)
status = ocfs2_journal_access_di(handle, retval = ocfs2_journal_access_di(handle,
INODE_CACHE(dir), INODE_CACHE(dir),
insert_bh, insert_bh,
OCFS2_JOURNAL_ACCESS_WRITE); OCFS2_JOURNAL_ACCESS_WRITE);
else { else {
status = ocfs2_journal_access_db(handle, retval = ocfs2_journal_access_db(handle,
INODE_CACHE(dir), INODE_CACHE(dir),
insert_bh, insert_bh,
OCFS2_JOURNAL_ACCESS_WRITE); OCFS2_JOURNAL_ACCESS_WRITE);
if (ocfs2_dir_indexed(dir)) { if (!retval && ocfs2_dir_indexed(dir))
status = ocfs2_dx_dir_insert(dir, retval = ocfs2_dx_dir_insert(dir,
handle, handle,
lookup); lookup);
if (status) { }
mlog_errno(status);
goto bail; if (retval) {
} mlog_errno(retval);
} goto bail;
} }
/* By now the buffer is marked for journaling */ /* By now the buffer is marked for journaling */