| Message ID | 20191009142748.18005-3-hch@lst.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/8] xfs: pass the correct flag to xlog_write_iclog | expand |
On Wed, Oct 09, 2019 at 04:27:42PM +0200, Christoph Hellwig wrote: > ic_io_size is only used inside xlog_write_iclog, where we can just use > the count parameter intead. > > Signed-off-by: Christoph Hellwig <hch@lst.de> Looks ok, Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com> --D > --- > fs/xfs/xfs_log.c | 6 ++---- > fs/xfs/xfs_log_priv.h | 3 --- > 2 files changed, 2 insertions(+), 7 deletions(-) > > diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c > index cd90871c2101..4f5927ddfa40 100644 > --- a/fs/xfs/xfs_log.c > +++ b/fs/xfs/xfs_log.c > @@ -1740,8 +1740,6 @@ xlog_write_iclog( > return; > } > > - iclog->ic_io_size = count; > - > bio_init(&iclog->ic_bio, iclog->ic_bvec, howmany(count, PAGE_SIZE)); > bio_set_dev(&iclog->ic_bio, log->l_targ->bt_bdev); > iclog->ic_bio.bi_iter.bi_sector = log->l_logBBstart + bno; > @@ -1751,9 +1749,9 @@ xlog_write_iclog( > if (need_flush) > iclog->ic_bio.bi_opf |= REQ_PREFLUSH; > > - xlog_map_iclog_data(&iclog->ic_bio, iclog->ic_data, iclog->ic_io_size); > + xlog_map_iclog_data(&iclog->ic_bio, iclog->ic_data, count); > if (is_vmalloc_addr(iclog->ic_data)) > - flush_kernel_vmap_range(iclog->ic_data, iclog->ic_io_size); > + flush_kernel_vmap_range(iclog->ic_data, count); > > /* > * If this log buffer would straddle the end of the log we will have > diff --git a/fs/xfs/xfs_log_priv.h b/fs/xfs/xfs_log_priv.h > index b880c23cb6e4..90e210e433cf 100644 > --- a/fs/xfs/xfs_log_priv.h > +++ b/fs/xfs/xfs_log_priv.h > @@ -179,8 +179,6 @@ typedef struct xlog_ticket { > * - ic_next is the pointer to the next iclog in the ring. > * - ic_log is a pointer back to the global log structure. > * - ic_size is the full size of the log buffer, minus the cycle headers. > - * - ic_io_size is the size of the currently pending log buffer write, which > - * might be smaller than ic_size > * - ic_offset is the current number of bytes written to in this iclog. > * - ic_refcnt is bumped when someone is writing to the log. > * - ic_state is the state of the iclog. > @@ -205,7 +203,6 @@ typedef struct xlog_in_core { > struct xlog_in_core *ic_prev; > struct xlog *ic_log; > u32 ic_size; > - u32 ic_io_size; > u32 ic_offset; > unsigned short ic_state; > char *ic_datap; /* pointer to iclog data */ > -- > 2.20.1 >
On Wed, Oct 09, 2019 at 04:27:42PM +0200, Christoph Hellwig wrote: > ic_io_size is only used inside xlog_write_iclog, where we can just use > the count parameter intead. > > Signed-off-by: Christoph Hellwig <hch@lst.de> > --- Reviewed-by: Brian Foster <bfoster@redhat.com> > fs/xfs/xfs_log.c | 6 ++---- > fs/xfs/xfs_log_priv.h | 3 --- > 2 files changed, 2 insertions(+), 7 deletions(-) > > diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c > index cd90871c2101..4f5927ddfa40 100644 > --- a/fs/xfs/xfs_log.c > +++ b/fs/xfs/xfs_log.c > @@ -1740,8 +1740,6 @@ xlog_write_iclog( > return; > } > > - iclog->ic_io_size = count; > - > bio_init(&iclog->ic_bio, iclog->ic_bvec, howmany(count, PAGE_SIZE)); > bio_set_dev(&iclog->ic_bio, log->l_targ->bt_bdev); > iclog->ic_bio.bi_iter.bi_sector = log->l_logBBstart + bno; > @@ -1751,9 +1749,9 @@ xlog_write_iclog( > if (need_flush) > iclog->ic_bio.bi_opf |= REQ_PREFLUSH; > > - xlog_map_iclog_data(&iclog->ic_bio, iclog->ic_data, iclog->ic_io_size); > + xlog_map_iclog_data(&iclog->ic_bio, iclog->ic_data, count); > if (is_vmalloc_addr(iclog->ic_data)) > - flush_kernel_vmap_range(iclog->ic_data, iclog->ic_io_size); > + flush_kernel_vmap_range(iclog->ic_data, count); > > /* > * If this log buffer would straddle the end of the log we will have > diff --git a/fs/xfs/xfs_log_priv.h b/fs/xfs/xfs_log_priv.h > index b880c23cb6e4..90e210e433cf 100644 > --- a/fs/xfs/xfs_log_priv.h > +++ b/fs/xfs/xfs_log_priv.h > @@ -179,8 +179,6 @@ typedef struct xlog_ticket { > * - ic_next is the pointer to the next iclog in the ring. > * - ic_log is a pointer back to the global log structure. > * - ic_size is the full size of the log buffer, minus the cycle headers. > - * - ic_io_size is the size of the currently pending log buffer write, which > - * might be smaller than ic_size > * - ic_offset is the current number of bytes written to in this iclog. > * - ic_refcnt is bumped when someone is writing to the log. > * - ic_state is the state of the iclog. > @@ -205,7 +203,6 @@ typedef struct xlog_in_core { > struct xlog_in_core *ic_prev; > struct xlog *ic_log; > u32 ic_size; > - u32 ic_io_size; > u32 ic_offset; > unsigned short ic_state; > char *ic_datap; /* pointer to iclog data */ > -- > 2.20.1 >
diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c index cd90871c2101..4f5927ddfa40 100644 --- a/fs/xfs/xfs_log.c +++ b/fs/xfs/xfs_log.c @@ -1740,8 +1740,6 @@ xlog_write_iclog( return; } - iclog->ic_io_size = count; - bio_init(&iclog->ic_bio, iclog->ic_bvec, howmany(count, PAGE_SIZE)); bio_set_dev(&iclog->ic_bio, log->l_targ->bt_bdev); iclog->ic_bio.bi_iter.bi_sector = log->l_logBBstart + bno; @@ -1751,9 +1749,9 @@ xlog_write_iclog( if (need_flush) iclog->ic_bio.bi_opf |= REQ_PREFLUSH; - xlog_map_iclog_data(&iclog->ic_bio, iclog->ic_data, iclog->ic_io_size); + xlog_map_iclog_data(&iclog->ic_bio, iclog->ic_data, count); if (is_vmalloc_addr(iclog->ic_data)) - flush_kernel_vmap_range(iclog->ic_data, iclog->ic_io_size); + flush_kernel_vmap_range(iclog->ic_data, count); /* * If this log buffer would straddle the end of the log we will have diff --git a/fs/xfs/xfs_log_priv.h b/fs/xfs/xfs_log_priv.h index b880c23cb6e4..90e210e433cf 100644 --- a/fs/xfs/xfs_log_priv.h +++ b/fs/xfs/xfs_log_priv.h @@ -179,8 +179,6 @@ typedef struct xlog_ticket { * - ic_next is the pointer to the next iclog in the ring. * - ic_log is a pointer back to the global log structure. * - ic_size is the full size of the log buffer, minus the cycle headers. - * - ic_io_size is the size of the currently pending log buffer write, which - * might be smaller than ic_size * - ic_offset is the current number of bytes written to in this iclog. * - ic_refcnt is bumped when someone is writing to the log. * - ic_state is the state of the iclog. @@ -205,7 +203,6 @@ typedef struct xlog_in_core { struct xlog_in_core *ic_prev; struct xlog *ic_log; u32 ic_size; - u32 ic_io_size; u32 ic_offset; unsigned short ic_state; char *ic_datap; /* pointer to iclog data */
ic_io_size is only used inside xlog_write_iclog, where we can just use the count parameter intead. Signed-off-by: Christoph Hellwig <hch@lst.de> --- fs/xfs/xfs_log.c | 6 ++---- fs/xfs/xfs_log_priv.h | 3 --- 2 files changed, 2 insertions(+), 7 deletions(-)