xfs: remove XFS_BUF_STALE and XFS_BUF_SUPER_STALE

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Alex Elder <aelder@sgi.com>

1 files changed, 4 insertions, 2 deletions

diff --git a/fs/xfs/xfs_buf_item.c b/fs/xfs/xfs_buf_item.c
index 3243083d8693..8213f4a753dc 100644
--- a/fs/xfs/xfs_buf_item.c
+++ b/fs/xfs/xfs_buf_item.c
@@ -966,7 +966,9 @@ xfs_buf_iodone_callbacks(
          * I/O errors, there's no point in giving this a retry.
          */
         if (XFS_FORCED_SHUTDOWN(mp)) {
-                XFS_BUF_SUPER_STALE(bp);
+                xfs_buf_stale(bp);
+                xfs_buf_delwri_dequeue(bp);
+                XFS_BUF_DONE(bp);
                 trace_xfs_buf_item_iodone(bp, _RET_IP_);
                 goto do_callbacks;
         }
@@ -1005,7 +1007,7 @@ xfs_buf_iodone_callbacks(
          * If the write of the buffer was synchronous, we want to make
          * sure to return the error to the caller of xfs_bwrite().
          */
-        XFS_BUF_STALE(bp);
+        xfs_buf_stale(bp);
         XFS_BUF_DONE(bp);
         xfs_buf_delwri_dequeue(bp);