Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4fdc7781 authored by Lachlan McIlroy's avatar Lachlan McIlroy
Browse files

[XFS] Remove XFS_BUF_SHUT() and friends 



Code does nothing so remove it.

Reviewed-by: default avatarChristoph Hellwig <hch@infradead.org>
Signed-off-by: default avatarLachlan McIlroy <lachlan@sgi.com>
parent d415867e

fs/xfs/linux-2.6/xfs_buf.h

+0 −4
Original line number Diff line number Diff line
@@ -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)

fs/xfs/xfs_buf_item.c

+1 −15
Original line number Diff line number Diff line
@@ -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);

			}



			return;

		}

fs/xfs/xfs_inode.c

+0 −1
Original line number Diff line number Diff line
@@ -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 {