* [PATCH] xfs: convert xfs_log_commit_cil() to void
@ 2014-01-23 12:32 Jeff Liu
2014-01-23 18:40 ` Brian Foster
0 siblings, 1 reply; 2+ messages in thread
From: Jeff Liu @ 2014-01-23 12:32 UTC (permalink / raw)
To: xfs@oss.sgi.com
From: Jie Liu <jeff.liu@oracle.com>
Convert xfs_log_commit_cil() to a void function since it return nothing
but 0 in any case, after that we can simplify the relative code logic
in xfs_trans_commit() accordingly.
Signed-off-by: Jie Liu <jeff.liu@oracle.com>
---
fs/xfs/xfs_log.h | 2 +-
fs/xfs/xfs_log_cil.c | 3 +--
fs/xfs/xfs_trans.c | 12 ++----------
3 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/fs/xfs/xfs_log.h b/fs/xfs/xfs_log.h
index e148719..67927c3 100644
--- a/fs/xfs/xfs_log.h
+++ b/fs/xfs/xfs_log.h
@@ -129,7 +129,7 @@ void xlog_iodone(struct xfs_buf *);
struct xlog_ticket *xfs_log_ticket_get(struct xlog_ticket *ticket);
void xfs_log_ticket_put(struct xlog_ticket *ticket);
-int xfs_log_commit_cil(struct xfs_mount *mp, struct xfs_trans *tp,
+void xfs_log_commit_cil(struct xfs_mount *mp, struct xfs_trans *tp,
xfs_lsn_t *commit_lsn, int flags);
bool xfs_log_item_in_current_chkpt(struct xfs_log_item *lip);
diff --git a/fs/xfs/xfs_log_cil.c b/fs/xfs/xfs_log_cil.c
index 5eb51fc..bb1027a 100644
--- a/fs/xfs/xfs_log_cil.c
+++ b/fs/xfs/xfs_log_cil.c
@@ -740,7 +740,7 @@ xlog_cil_empty(
* background commit, returns without it held once background commits are
* allowed again.
*/
-int
+void
xfs_log_commit_cil(
struct xfs_mount *mp,
struct xfs_trans *tp,
@@ -786,7 +786,6 @@ xfs_log_commit_cil(
xlog_cil_push_background(log);
up_read(&cil->xc_ctx_lock);
- return 0;
}
/*
diff --git a/fs/xfs/xfs_trans.c b/fs/xfs/xfs_trans.c
index c812c5c..54a5732 100644
--- a/fs/xfs/xfs_trans.c
+++ b/fs/xfs/xfs_trans.c
@@ -887,12 +887,7 @@ xfs_trans_commit(
xfs_trans_apply_sb_deltas(tp);
xfs_trans_apply_dquot_deltas(tp);
- error = xfs_log_commit_cil(mp, tp, &commit_lsn, flags);
- if (error == ENOMEM) {
- xfs_force_shutdown(mp, SHUTDOWN_LOG_IO_ERROR);
- error = XFS_ERROR(EIO);
- goto out_unreserve;
- }
+ xfs_log_commit_cil(mp, tp, &commit_lsn, flags);
current_restore_flags_nested(&tp->t_pflags, PF_FSTRANS);
xfs_trans_free(tp);
@@ -902,10 +897,7 @@ xfs_trans_commit(
* log out now and wait for it.
*/
if (sync) {
- if (!error) {
- error = _xfs_log_force_lsn(mp, commit_lsn,
- XFS_LOG_SYNC, NULL);
- }
+ error = _xfs_log_force_lsn(mp, commit_lsn, XFS_LOG_SYNC, NULL);
XFS_STATS_INC(xs_trans_sync);
} else {
XFS_STATS_INC(xs_trans_async);
--
1.8.3.2
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] xfs: convert xfs_log_commit_cil() to void
2014-01-23 12:32 [PATCH] xfs: convert xfs_log_commit_cil() to void Jeff Liu
@ 2014-01-23 18:40 ` Brian Foster
0 siblings, 0 replies; 2+ messages in thread
From: Brian Foster @ 2014-01-23 18:40 UTC (permalink / raw)
To: xfs
On 01/23/2014 07:32 AM, Jeff Liu wrote:
> From: Jie Liu <jeff.liu@oracle.com>
>
> Convert xfs_log_commit_cil() to a void function since it return nothing
> but 0 in any case, after that we can simplify the relative code logic
> in xfs_trans_commit() accordingly.
>
> Signed-off-by: Jie Liu <jeff.liu@oracle.com>
> ---
9 less lines. ;)
Reviewed-by: Brian Foster <bfoster@redhat.com>
> fs/xfs/xfs_log.h | 2 +-
> fs/xfs/xfs_log_cil.c | 3 +--
> fs/xfs/xfs_trans.c | 12 ++----------
> 3 files changed, 4 insertions(+), 13 deletions(-)
>
> diff --git a/fs/xfs/xfs_log.h b/fs/xfs/xfs_log.h
> index e148719..67927c3 100644
> --- a/fs/xfs/xfs_log.h
> +++ b/fs/xfs/xfs_log.h
> @@ -129,7 +129,7 @@ void xlog_iodone(struct xfs_buf *);
> struct xlog_ticket *xfs_log_ticket_get(struct xlog_ticket *ticket);
> void xfs_log_ticket_put(struct xlog_ticket *ticket);
>
> -int xfs_log_commit_cil(struct xfs_mount *mp, struct xfs_trans *tp,
> +void xfs_log_commit_cil(struct xfs_mount *mp, struct xfs_trans *tp,
> xfs_lsn_t *commit_lsn, int flags);
> bool xfs_log_item_in_current_chkpt(struct xfs_log_item *lip);
>
> diff --git a/fs/xfs/xfs_log_cil.c b/fs/xfs/xfs_log_cil.c
> index 5eb51fc..bb1027a 100644
> --- a/fs/xfs/xfs_log_cil.c
> +++ b/fs/xfs/xfs_log_cil.c
> @@ -740,7 +740,7 @@ xlog_cil_empty(
> * background commit, returns without it held once background commits are
> * allowed again.
> */
> -int
> +void
> xfs_log_commit_cil(
> struct xfs_mount *mp,
> struct xfs_trans *tp,
> @@ -786,7 +786,6 @@ xfs_log_commit_cil(
> xlog_cil_push_background(log);
>
> up_read(&cil->xc_ctx_lock);
> - return 0;
> }
>
> /*
> diff --git a/fs/xfs/xfs_trans.c b/fs/xfs/xfs_trans.c
> index c812c5c..54a5732 100644
> --- a/fs/xfs/xfs_trans.c
> +++ b/fs/xfs/xfs_trans.c
> @@ -887,12 +887,7 @@ xfs_trans_commit(
> xfs_trans_apply_sb_deltas(tp);
> xfs_trans_apply_dquot_deltas(tp);
>
> - error = xfs_log_commit_cil(mp, tp, &commit_lsn, flags);
> - if (error == ENOMEM) {
> - xfs_force_shutdown(mp, SHUTDOWN_LOG_IO_ERROR);
> - error = XFS_ERROR(EIO);
> - goto out_unreserve;
> - }
> + xfs_log_commit_cil(mp, tp, &commit_lsn, flags);
>
> current_restore_flags_nested(&tp->t_pflags, PF_FSTRANS);
> xfs_trans_free(tp);
> @@ -902,10 +897,7 @@ xfs_trans_commit(
> * log out now and wait for it.
> */
> if (sync) {
> - if (!error) {
> - error = _xfs_log_force_lsn(mp, commit_lsn,
> - XFS_LOG_SYNC, NULL);
> - }
> + error = _xfs_log_force_lsn(mp, commit_lsn, XFS_LOG_SYNC, NULL);
> XFS_STATS_INC(xs_trans_sync);
> } else {
> XFS_STATS_INC(xs_trans_async);
>
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-01-23 18:40 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-01-23 12:32 [PATCH] xfs: convert xfs_log_commit_cil() to void Jeff Liu
2014-01-23 18:40 ` Brian Foster
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).