xfs: get rid of log item callbacks

They are not used anymore, so remove them from the log item and the
buffer iodone attachment interfaces.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>

diff --git a/fs/xfs/xfs_buf_item.c b/fs/xfs/xfs_buf_item.c
index 0ece5de9dd7110ce9c3f399db59b62372f67ea19..09bfe9c52dbdb96a2c1838442247637fff1312c0 100644 (file)
--- a/fs/xfs/xfs_buf_item.c
+++ b/fs/xfs/xfs_buf_item.c
@@ -955,23 +955,6 @@ xfs_buf_item_relse(
        xfs_buf_item_free(bip);
 }
 
-
-/*
- * Add the given log item with its callback to the list of callbacks
- * to be called when the buffer's I/O completes.
- */
-void
-xfs_buf_attach_iodone(
-       struct xfs_buf          *bp,
-       void                    (*cb)(struct xfs_buf *, struct xfs_log_item *),
-       struct xfs_log_item     *lip)
-{
-       ASSERT(xfs_buf_islocked(bp));
-
-       lip->li_cb = cb;
-       list_add_tail(&lip->li_bio_list, &bp->b_li_list);
-}
-
 /*
  * Invoke the error state callback for each log item affected by the failed I/O.
  *

diff --git a/fs/xfs/xfs_buf_item.h b/fs/xfs/xfs_buf_item.h
index 7c0bd2a210aff28a3c5d26988d8130f0fb845659..23507cbb4c41320d5bcbd65410490353a9e40c18 100644 (file)
--- a/fs/xfs/xfs_buf_item.h
+++ b/fs/xfs/xfs_buf_item.h
@@ -54,9 +54,6 @@ void  xfs_buf_item_relse(struct xfs_buf *);
 bool   xfs_buf_item_put(struct xfs_buf_log_item *);
 void   xfs_buf_item_log(struct xfs_buf_log_item *, uint, uint);
 bool   xfs_buf_item_dirty_format(struct xfs_buf_log_item *);
-void   xfs_buf_attach_iodone(struct xfs_buf *,
-                             void(*)(struct xfs_buf *, struct xfs_log_item *),
-                             struct xfs_log_item *);
 void   xfs_buf_inode_iodone(struct xfs_buf *);
 void   xfs_buf_dquot_iodone(struct xfs_buf *);
 void   xfs_buf_iodone(struct xfs_buf *);

diff --git a/fs/xfs/xfs_dquot.c b/fs/xfs/xfs_dquot.c
index 403bc4e9f21ff0894a586a889f1d006a3cc3b5d5..d5984a926d1d04736ed15854679ff05805885c86 100644 (file)
--- a/fs/xfs/xfs_dquot.c
+++ b/fs/xfs/xfs_dquot.c
@@ -1187,11 +1187,11 @@ xfs_qm_dqflush(
        }
 
        /*
-        * Attach an iodone routine so that we can remove this dquot from the
-        * AIL and release the flush lock once the dquot is synced to disk.
+        * Attach the dquot to the buffer so that we can remove this dquot from
+        * the AIL and release the flush lock once the dquot is synced to disk.
         */
        bp->b_flags |= _XBF_DQUOTS;
-       xfs_buf_attach_iodone(bp, NULL, &dqp->q_logitem.qli_item);
+       list_add_tail(&dqp->q_logitem.qli_item.li_bio_list, &bp->b_li_list);
 
        /*
         * If the buffer is pinned then push on the log so we won't

diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
index 721b8420be0460f5a039d4b9243eb69e62efa342..77cc9cbcd311eec141ee44aa96421bddde33cdbc 100644 (file)
--- a/fs/xfs/xfs_inode.c
+++ b/fs/xfs/xfs_inode.c
@@ -2711,7 +2711,8 @@ xfs_ifree_cluster(
                        xfs_trans_ail_copy_lsn(mp->m_ail, &iip->ili_flush_lsn,
                                                &iip->ili_item.li_lsn);
 
-                       xfs_buf_attach_iodone(bp, NULL, &iip->ili_item);
+                       list_add_tail(&iip->ili_item.li_bio_list,
+                                               &bp->b_li_list);
 
                        if (ip != free_ip)
                                xfs_iunlock(ip, XFS_ILOCK_EXCL);
@@ -3861,7 +3862,7 @@ flush_out:
         * the flush lock.
         */
        bp->b_flags |= _XBF_INODES;
-       xfs_buf_attach_iodone(bp, NULL, &iip->ili_item);
+       list_add_tail(&iip->ili_item.li_bio_list, &bp->b_li_list);
 
        /* generate the checksum. */
        xfs_dinode_calc_crc(mp, dip);

diff --git a/fs/xfs/xfs_trans.h b/fs/xfs/xfs_trans.h
index 8308bf6d7e4041662a9964873139f2c6e804e966..99a9ab9cab25b4a938b9bf03ad79b56cdf66dea9 100644 (file)
--- a/fs/xfs/xfs_trans.h
+++ b/fs/xfs/xfs_trans.h
@@ -37,10 +37,6 @@ struct xfs_log_item {
        unsigned long                   li_flags;       /* misc flags */
        struct xfs_buf                  *li_buf;        /* real buffer pointer */
        struct list_head                li_bio_list;    /* buffer item list */
-       void                            (*li_cb)(struct xfs_buf *,
-                                                struct xfs_log_item *);
-                                                       /* buffer item iodone */
-                                                       /* callback func */
        const struct xfs_item_ops       *li_ops;        /* function list */
 
        /* delayed logging */