| Message ID | 20190613180300.30447-6-hch@lst.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [01/20] xfs: fix a trivial comment typo in xfs_trans_committed_bulk | expand |
On Thu, Jun 13, 2019 at 08:02:45PM +0200, Christoph Hellwig wrote: > If we want to push the log to make progress on the items we'd need to > return XFS_ITEM_PINNED instead of XFS_ITEM_LOCKED. Removing the > method will do exactly that. > > Signed-off-by: Christoph Hellwig <hch@lst.de> > --- Wasn't this one supposed to be dropped? Brian > fs/xfs/xfs_dquot_item.c | 14 -------------- > 1 file changed, 14 deletions(-) > > diff --git a/fs/xfs/xfs_dquot_item.c b/fs/xfs/xfs_dquot_item.c > index 486eea151fdb..a61a8a770d7f 100644 > --- a/fs/xfs/xfs_dquot_item.c > +++ b/fs/xfs/xfs_dquot_item.c > @@ -288,18 +288,6 @@ xfs_qm_qoff_logitem_format( > xlog_finish_iovec(lv, vecp, sizeof(struct xfs_qoff_logitem)); > } > > -/* > - * There isn't much you can do to push a quotaoff item. It is simply > - * stuck waiting for the log to be flushed to disk. > - */ > -STATIC uint > -xfs_qm_qoff_logitem_push( > - struct xfs_log_item *lip, > - struct list_head *buffer_list) > -{ > - return XFS_ITEM_LOCKED; > -} > - > STATIC xfs_lsn_t > xfs_qm_qoffend_logitem_committed( > struct xfs_log_item *lip, > @@ -327,7 +315,6 @@ static const struct xfs_item_ops xfs_qm_qoffend_logitem_ops = { > .iop_size = xfs_qm_qoff_logitem_size, > .iop_format = xfs_qm_qoff_logitem_format, > .iop_committed = xfs_qm_qoffend_logitem_committed, > - .iop_push = xfs_qm_qoff_logitem_push, > }; > > /* > @@ -336,7 +323,6 @@ static const struct xfs_item_ops xfs_qm_qoffend_logitem_ops = { > static const struct xfs_item_ops xfs_qm_qoff_logitem_ops = { > .iop_size = xfs_qm_qoff_logitem_size, > .iop_format = xfs_qm_qoff_logitem_format, > - .iop_push = xfs_qm_qoff_logitem_push, > }; > > /* > -- > 2.20.1 >
On Fri, Jun 14, 2019 at 10:43:32AM -0400, Brian Foster wrote: > On Thu, Jun 13, 2019 at 08:02:45PM +0200, Christoph Hellwig wrote: > > If we want to push the log to make progress on the items we'd need to > > return XFS_ITEM_PINNED instead of XFS_ITEM_LOCKED. Removing the > > method will do exactly that. > > > > Signed-off-by: Christoph Hellwig <hch@lst.de> > > --- > > Wasn't this one supposed to be dropped? Yes, and I thought I did..
diff --git a/fs/xfs/xfs_dquot_item.c b/fs/xfs/xfs_dquot_item.c index 486eea151fdb..a61a8a770d7f 100644 --- a/fs/xfs/xfs_dquot_item.c +++ b/fs/xfs/xfs_dquot_item.c @@ -288,18 +288,6 @@ xfs_qm_qoff_logitem_format( xlog_finish_iovec(lv, vecp, sizeof(struct xfs_qoff_logitem)); } -/* - * There isn't much you can do to push a quotaoff item. It is simply - * stuck waiting for the log to be flushed to disk. - */ -STATIC uint -xfs_qm_qoff_logitem_push( - struct xfs_log_item *lip, - struct list_head *buffer_list) -{ - return XFS_ITEM_LOCKED; -} - STATIC xfs_lsn_t xfs_qm_qoffend_logitem_committed( struct xfs_log_item *lip, @@ -327,7 +315,6 @@ static const struct xfs_item_ops xfs_qm_qoffend_logitem_ops = { .iop_size = xfs_qm_qoff_logitem_size, .iop_format = xfs_qm_qoff_logitem_format, .iop_committed = xfs_qm_qoffend_logitem_committed, - .iop_push = xfs_qm_qoff_logitem_push, }; /* @@ -336,7 +323,6 @@ static const struct xfs_item_ops xfs_qm_qoffend_logitem_ops = { static const struct xfs_item_ops xfs_qm_qoff_logitem_ops = { .iop_size = xfs_qm_qoff_logitem_size, .iop_format = xfs_qm_qoff_logitem_format, - .iop_push = xfs_qm_qoff_logitem_push, }; /*
If we want to push the log to make progress on the items we'd need to return XFS_ITEM_PINNED instead of XFS_ITEM_LOCKED. Removing the method will do exactly that. Signed-off-by: Christoph Hellwig <hch@lst.de> --- fs/xfs/xfs_dquot_item.c | 14 -------------- 1 file changed, 14 deletions(-)