Skip to content

Commit

Permalink
[XFS] Remove XFS_BUF_SHUT() and friends
Browse files Browse the repository at this point in the history
Code does nothing so remove it.

Reviewed-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>
  • Loading branch information
Lachlan McIlroy committed Dec 22, 2008
1 parent d415867 commit 4fdc778
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 20 deletions.
4 changes: 0 additions & 4 deletions fs/xfs/linux-2.6/xfs_buf.h
Original file line number Diff line number Diff line change
Expand Up @@ -312,10 +312,6 @@ extern void xfs_buf_trace(xfs_buf_t *, char *, void *, void *);
#define XFS_BUF_UNORDERED(bp) ((bp)->b_flags &= ~XBF_ORDERED)
#define XFS_BUF_ISORDERED(bp) ((bp)->b_flags & XBF_ORDERED)

#define XFS_BUF_SHUT(bp) do { } while (0)
#define XFS_BUF_UNSHUT(bp) do { } while (0)
#define XFS_BUF_ISSHUT(bp) (0)

#define XFS_BUF_HOLD(bp) xfs_buf_hold(bp)
#define XFS_BUF_READ(bp) ((bp)->b_flags |= XBF_READ)
#define XFS_BUF_UNREAD(bp) ((bp)->b_flags &= ~XBF_READ)
Expand Down
16 changes: 1 addition & 15 deletions fs/xfs/xfs_buf_item.c
Original file line number Diff line number Diff line change
Expand Up @@ -998,21 +998,7 @@ xfs_buf_iodone_callbacks(
xfs_buf_do_callbacks(bp, lip);
XFS_BUF_SET_FSPRIVATE(bp, NULL);
XFS_BUF_CLR_IODONE_FUNC(bp);

/*
* XFS_SHUT flag gets set when we go thru the
* entire buffer cache and deliberately start
* throwing away delayed write buffers.
* Since there's no biowait done on those,
* we should just brelse them.
*/
if (XFS_BUF_ISSHUT(bp)) {
XFS_BUF_UNSHUT(bp);
xfs_buf_relse(bp);
} else {
xfs_biodone(bp);
}

xfs_biodone(bp);
return;
}

Expand Down
1 change: 0 additions & 1 deletion fs/xfs/xfs_inode.c
Original file line number Diff line number Diff line change
Expand Up @@ -2804,7 +2804,6 @@ xfs_iflush_cluster(
XFS_BUF_CLR_BDSTRAT_FUNC(bp);
XFS_BUF_UNDONE(bp);
XFS_BUF_STALE(bp);
XFS_BUF_SHUT(bp);
XFS_BUF_ERROR(bp,EIO);
xfs_biodone(bp);
} else {
Expand Down

0 comments on commit 4fdc778

Please sign in to comment.