* [Ocfs2-devel] [PATCH 2/4 RESEND] ocfs2: remove extra mlog_errno() call in __ocfs2_add_entry()
@ 2015-02-27 23:49 ` Daeseok Youn
0 siblings, 0 replies; 6+ messages in thread
From: Daeseok Youn @ 2015-02-27 23:49 UTC (permalink / raw)
To: mfasheh, akpm; +Cc: jlbec, ocfs2-devel, linux-kernel
Signed-off-by: Daeseok Youn <daeseok.youn@gmail.com>
---
RESEND: this patch is rebased by 1/4
fs/ocfs2/dir.c | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/fs/ocfs2/dir.c b/fs/ocfs2/dir.c
index 1478a50..c1ab24f 100644
--- a/fs/ocfs2/dir.c
+++ b/fs/ocfs2/dir.c
@@ -1689,10 +1689,8 @@ int __ocfs2_add_entry(handle_t *handle,
if (ocfs2_dirent_would_fit(de, rec_len)) {
dir->i_mtime = dir->i_ctime = CURRENT_TIME;
retval = ocfs2_mark_inode_dirty(handle, dir, parent_fe_bh);
- if (retval < 0) {
- mlog_errno(retval);
+ if (retval < 0)
goto bail;
- }
if (insert_bh == parent_fe_bh)
retval = ocfs2_journal_access_di(handle,
@@ -1709,10 +1707,8 @@ int __ocfs2_add_entry(handle_t *handle,
retval = ocfs2_dx_dir_insert(dir,
handle,
lookup);
- if (retval) {
- mlog_errno(retval);
+ if (retval)
goto bail;
- }
}
}
--
1.7.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/4 RESEND] ocfs2: remove extra mlog_errno() call in __ocfs2_add_entry()
@ 2015-02-27 23:49 ` Daeseok Youn
0 siblings, 0 replies; 6+ messages in thread
From: Daeseok Youn @ 2015-02-27 23:49 UTC (permalink / raw)
To: mfasheh, akpm; +Cc: jlbec, ocfs2-devel, linux-kernel
Signed-off-by: Daeseok Youn <daeseok.youn@gmail.com>
---
RESEND: this patch is rebased by 1/4
fs/ocfs2/dir.c | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/fs/ocfs2/dir.c b/fs/ocfs2/dir.c
index 1478a50..c1ab24f 100644
--- a/fs/ocfs2/dir.c
+++ b/fs/ocfs2/dir.c
@@ -1689,10 +1689,8 @@ int __ocfs2_add_entry(handle_t *handle,
if (ocfs2_dirent_would_fit(de, rec_len)) {
dir->i_mtime = dir->i_ctime = CURRENT_TIME;
retval = ocfs2_mark_inode_dirty(handle, dir, parent_fe_bh);
- if (retval < 0) {
- mlog_errno(retval);
+ if (retval < 0)
goto bail;
- }
if (insert_bh == parent_fe_bh)
retval = ocfs2_journal_access_di(handle,
@@ -1709,10 +1707,8 @@ int __ocfs2_add_entry(handle_t *handle,
retval = ocfs2_dx_dir_insert(dir,
handle,
lookup);
- if (retval) {
- mlog_errno(retval);
+ if (retval)
goto bail;
- }
}
}
--
1.7.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [Ocfs2-devel] [PATCH 2/4 RESEND] ocfs2: remove extra mlog_errno() call in __ocfs2_add_entry()
2015-02-27 23:49 ` Daeseok Youn
@ 2015-03-19 10:45 ` Joseph Qi
-1 siblings, 0 replies; 6+ messages in thread
From: Joseph Qi @ 2015-03-19 10:45 UTC (permalink / raw)
To: Daeseok Youn; +Cc: mfasheh, akpm, ocfs2-devel, linux-kernel
On 2015/2/28 7:49, Daeseok Youn wrote:
> Signed-off-by: Daeseok Youn <daeseok.youn@gmail.com>
> ---
> RESEND: this patch is rebased by 1/4
>
> fs/ocfs2/dir.c | 8 ++------
> 1 files changed, 2 insertions(+), 6 deletions(-)
>
> diff --git a/fs/ocfs2/dir.c b/fs/ocfs2/dir.c
> index 1478a50..c1ab24f 100644
> --- a/fs/ocfs2/dir.c
> +++ b/fs/ocfs2/dir.c
> @@ -1689,10 +1689,8 @@ int __ocfs2_add_entry(handle_t *handle,
> if (ocfs2_dirent_would_fit(de, rec_len)) {
> dir->i_mtime = dir->i_ctime = CURRENT_TIME;
> retval = ocfs2_mark_inode_dirty(handle, dir, parent_fe_bh);
> - if (retval < 0) {
> - mlog_errno(retval);
> + if (retval < 0)
> goto bail;
> - }
>
> if (insert_bh == parent_fe_bh)
> retval = ocfs2_journal_access_di(handle,
> @@ -1709,10 +1707,8 @@ int __ocfs2_add_entry(handle_t *handle,
> retval = ocfs2_dx_dir_insert(dir,
> handle,
> lookup);
> - if (retval) {
> - mlog_errno(retval);
> + if (retval)
> goto bail;
> - }
> }
> }
>
>
IMO, these two mlogs are not "extra" because we can directly know the
cause if error occurs.
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [Ocfs2-devel] [PATCH 2/4 RESEND] ocfs2: remove extra mlog_errno() call in __ocfs2_add_entry()
@ 2015-03-19 10:45 ` Joseph Qi
0 siblings, 0 replies; 6+ messages in thread
From: Joseph Qi @ 2015-03-19 10:45 UTC (permalink / raw)
To: Daeseok Youn; +Cc: mfasheh, akpm, ocfs2-devel, linux-kernel
On 2015/2/28 7:49, Daeseok Youn wrote:
> Signed-off-by: Daeseok Youn <daeseok.youn@gmail.com>
> ---
> RESEND: this patch is rebased by 1/4
>
> fs/ocfs2/dir.c | 8 ++------
> 1 files changed, 2 insertions(+), 6 deletions(-)
>
> diff --git a/fs/ocfs2/dir.c b/fs/ocfs2/dir.c
> index 1478a50..c1ab24f 100644
> --- a/fs/ocfs2/dir.c
> +++ b/fs/ocfs2/dir.c
> @@ -1689,10 +1689,8 @@ int __ocfs2_add_entry(handle_t *handle,
> if (ocfs2_dirent_would_fit(de, rec_len)) {
> dir->i_mtime = dir->i_ctime = CURRENT_TIME;
> retval = ocfs2_mark_inode_dirty(handle, dir, parent_fe_bh);
> - if (retval < 0) {
> - mlog_errno(retval);
> + if (retval < 0)
> goto bail;
> - }
>
> if (insert_bh == parent_fe_bh)
> retval = ocfs2_journal_access_di(handle,
> @@ -1709,10 +1707,8 @@ int __ocfs2_add_entry(handle_t *handle,
> retval = ocfs2_dx_dir_insert(dir,
> handle,
> lookup);
> - if (retval) {
> - mlog_errno(retval);
> + if (retval)
> goto bail;
> - }
> }
> }
>
>
IMO, these two mlogs are not "extra" because we can directly know the
cause if error occurs.
^ permalink raw reply [flat|nested] 6+ messages in thread* [Ocfs2-devel] [PATCH 2/4 RESEND] ocfs2: remove extra mlog_errno() call in __ocfs2_add_entry()
2015-03-19 10:45 ` Joseph Qi
@ 2015-03-20 2:30 ` DaeSeok Youn
-1 siblings, 0 replies; 6+ messages in thread
From: DaeSeok Youn @ 2015-03-20 2:30 UTC (permalink / raw)
To: Joseph Qi
Cc: mfasheh, Andrew Morton, ocfs2-devel@oss.oracle.com, linux-kernel
OK.
If i want to clean up mlog() call twice, mlog() in " bail" can be
removed, right?
Thanks.
Regards,
Daeseok Youn
2015-03-19 19:45 GMT+09:00 Joseph Qi <joseph.qi@huawei.com>:
> On 2015/2/28 7:49, Daeseok Youn wrote:
>> Signed-off-by: Daeseok Youn <daeseok.youn@gmail.com>
>> ---
>> RESEND: this patch is rebased by 1/4
>>
>> fs/ocfs2/dir.c | 8 ++------
>> 1 files changed, 2 insertions(+), 6 deletions(-)
>>
>> diff --git a/fs/ocfs2/dir.c b/fs/ocfs2/dir.c
>> index 1478a50..c1ab24f 100644
>> --- a/fs/ocfs2/dir.c
>> +++ b/fs/ocfs2/dir.c
>> @@ -1689,10 +1689,8 @@ int __ocfs2_add_entry(handle_t *handle,
>> if (ocfs2_dirent_would_fit(de, rec_len)) {
>> dir->i_mtime = dir->i_ctime = CURRENT_TIME;
>> retval = ocfs2_mark_inode_dirty(handle, dir, parent_fe_bh);
>> - if (retval < 0) {
>> - mlog_errno(retval);
>> + if (retval < 0)
>> goto bail;
>> - }
>>
>> if (insert_bh == parent_fe_bh)
>> retval = ocfs2_journal_access_di(handle,
>> @@ -1709,10 +1707,8 @@ int __ocfs2_add_entry(handle_t *handle,
>> retval = ocfs2_dx_dir_insert(dir,
>> handle,
>> lookup);
>> - if (retval) {
>> - mlog_errno(retval);
>> + if (retval)
>> goto bail;
>> - }
>> }
>> }
>>
>>
> IMO, these two mlogs are not "extra" because we can directly know the
> cause if error occurs.
>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [Ocfs2-devel] [PATCH 2/4 RESEND] ocfs2: remove extra mlog_errno() call in __ocfs2_add_entry()
@ 2015-03-20 2:30 ` DaeSeok Youn
0 siblings, 0 replies; 6+ messages in thread
From: DaeSeok Youn @ 2015-03-20 2:30 UTC (permalink / raw)
To: Joseph Qi
Cc: mfasheh, Andrew Morton, ocfs2-devel@oss.oracle.com, linux-kernel
OK.
If i want to clean up mlog() call twice, mlog() in " bail" can be
removed, right?
Thanks.
Regards,
Daeseok Youn
2015-03-19 19:45 GMT+09:00 Joseph Qi <joseph.qi@huawei.com>:
> On 2015/2/28 7:49, Daeseok Youn wrote:
>> Signed-off-by: Daeseok Youn <daeseok.youn@gmail.com>
>> ---
>> RESEND: this patch is rebased by 1/4
>>
>> fs/ocfs2/dir.c | 8 ++------
>> 1 files changed, 2 insertions(+), 6 deletions(-)
>>
>> diff --git a/fs/ocfs2/dir.c b/fs/ocfs2/dir.c
>> index 1478a50..c1ab24f 100644
>> --- a/fs/ocfs2/dir.c
>> +++ b/fs/ocfs2/dir.c
>> @@ -1689,10 +1689,8 @@ int __ocfs2_add_entry(handle_t *handle,
>> if (ocfs2_dirent_would_fit(de, rec_len)) {
>> dir->i_mtime = dir->i_ctime = CURRENT_TIME;
>> retval = ocfs2_mark_inode_dirty(handle, dir, parent_fe_bh);
>> - if (retval < 0) {
>> - mlog_errno(retval);
>> + if (retval < 0)
>> goto bail;
>> - }
>>
>> if (insert_bh == parent_fe_bh)
>> retval = ocfs2_journal_access_di(handle,
>> @@ -1709,10 +1707,8 @@ int __ocfs2_add_entry(handle_t *handle,
>> retval = ocfs2_dx_dir_insert(dir,
>> handle,
>> lookup);
>> - if (retval) {
>> - mlog_errno(retval);
>> + if (retval)
>> goto bail;
>> - }
>> }
>> }
>>
>>
> IMO, these two mlogs are not "extra" because we can directly know the
> cause if error occurs.
>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2015-03-20 2:30 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-02-27 23:49 [Ocfs2-devel] [PATCH 2/4 RESEND] ocfs2: remove extra mlog_errno() call in __ocfs2_add_entry() Daeseok Youn
2015-02-27 23:49 ` Daeseok Youn
2015-03-19 10:45 ` [Ocfs2-devel] " Joseph Qi
2015-03-19 10:45 ` Joseph Qi
2015-03-20 2:30 ` DaeSeok Youn
2015-03-20 2:30 ` DaeSeok Youn
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.