linux-kernel - Re: [Ocfs2-devel] [PATCH 3/4 RESEND] ocfs2: need to handle error for ocfs2_journal_access

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <550AAC4B.8000505@huawei.com>
Date:	Thu, 19 Mar 2015 19:00:27 +0800
From:	Joseph Qi <joseph.qi@...wei.com>
To:	Daeseok Youn <daeseok.youn@...il.com>
CC:	<mfasheh@...e.com>, <akpm@...ux-foundation.org>,
	<richard.weinberger@...il.com>, <ocfs2-devel@....oracle.com>,
	<linux-kernel@...r.kernel.org>
Subject: Re: [Ocfs2-devel] [PATCH 3/4 RESEND] ocfs2: need to handle error
 for ocfs2_journal_access_di() call

On 2015/2/28 7:51, Daeseok Youn wrote:
> There is no error handle when ocfs2_journal_access_di() is failed.
> And also it doesn't need to call ocfs2_dx_dir_insert() when
> ocfs2_journal_access_db() is failed.
> 
> Signed-off-by: Daeseok Youn <daeseok.youn@...il.com>
> ---
> RESEND: this patch rebased by 1/4
> 
>  fs/ocfs2/dir.c |    8 ++++----
>  1 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/fs/ocfs2/dir.c b/fs/ocfs2/dir.c
> index c1ab24f..c63f2b6 100644
> --- a/fs/ocfs2/dir.c
> +++ b/fs/ocfs2/dir.c
> @@ -1703,15 +1703,15 @@ int __ocfs2_add_entry(handle_t *handle,
>  								 insert_bh,
>  					      OCFS2_JOURNAL_ACCESS_WRITE);
>  
> -				if (ocfs2_dir_indexed(dir)) {
> +				if (!retval && ocfs2_dir_indexed(dir))
>  					retval = ocfs2_dx_dir_insert(dir,
>  								handle,
>  								lookup);
> -					if (retval)
> -						goto bail;
> -				}
>  			}
>  
> +			if (retval)
> +				goto bail;
> +
>  			/* By now the buffer is marked for journaling */
>  			offset += le16_to_cpu(de->rec_len);
>  			if (le64_to_cpu(de->inode)) {
> 
I agree with you that we should do the corresponding check.
But I don't think we need remove the mlog as described in my previous
mail.

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/