diff options
author | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-12-22 01:52:58 -0500 |
---|---|---|
committer | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-12-22 01:52:58 -0500 |
commit | 4fdc7781799926dca6c3a3bb6e9533a9718c4dea (patch) | |
tree | 5a2aa2b3ff6f13fb8eeb4079c857f16012d7ac20 | |
parent | d415867e0abc35e3b2f0d4196e98c339d6fe29a2 (diff) |
[XFS] Remove XFS_BUF_SHUT() and friends
Code does nothing so remove it.
Reviewed-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>
-rw-r--r-- | fs/xfs/linux-2.6/xfs_buf.h | 4 | ||||
-rw-r--r-- | fs/xfs/xfs_buf_item.c | 16 | ||||
-rw-r--r-- | fs/xfs/xfs_inode.c | 1 |
3 files changed, 1 insertions, 20 deletions
diff --git a/fs/xfs/linux-2.6/xfs_buf.h b/fs/xfs/linux-2.6/xfs_buf.h index af8764e02d78..288ae7c4c800 100644 --- a/fs/xfs/linux-2.6/xfs_buf.h +++ b/fs/xfs/linux-2.6/xfs_buf.h | |||
@@ -312,10 +312,6 @@ extern void xfs_buf_trace(xfs_buf_t *, char *, void *, void *); | |||
312 | #define XFS_BUF_UNORDERED(bp) ((bp)->b_flags &= ~XBF_ORDERED) | 312 | #define XFS_BUF_UNORDERED(bp) ((bp)->b_flags &= ~XBF_ORDERED) |
313 | #define XFS_BUF_ISORDERED(bp) ((bp)->b_flags & XBF_ORDERED) | 313 | #define XFS_BUF_ISORDERED(bp) ((bp)->b_flags & XBF_ORDERED) |
314 | 314 | ||
315 | #define XFS_BUF_SHUT(bp) do { } while (0) | ||
316 | #define XFS_BUF_UNSHUT(bp) do { } while (0) | ||
317 | #define XFS_BUF_ISSHUT(bp) (0) | ||
318 | |||
319 | #define XFS_BUF_HOLD(bp) xfs_buf_hold(bp) | 315 | #define XFS_BUF_HOLD(bp) xfs_buf_hold(bp) |
320 | #define XFS_BUF_READ(bp) ((bp)->b_flags |= XBF_READ) | 316 | #define XFS_BUF_READ(bp) ((bp)->b_flags |= XBF_READ) |
321 | #define XFS_BUF_UNREAD(bp) ((bp)->b_flags &= ~XBF_READ) | 317 | #define XFS_BUF_UNREAD(bp) ((bp)->b_flags &= ~XBF_READ) |
diff --git a/fs/xfs/xfs_buf_item.c b/fs/xfs/xfs_buf_item.c index d74ce1134262..92af4098c7e8 100644 --- a/fs/xfs/xfs_buf_item.c +++ b/fs/xfs/xfs_buf_item.c | |||
@@ -998,21 +998,7 @@ xfs_buf_iodone_callbacks( | |||
998 | xfs_buf_do_callbacks(bp, lip); | 998 | xfs_buf_do_callbacks(bp, lip); |
999 | XFS_BUF_SET_FSPRIVATE(bp, NULL); | 999 | XFS_BUF_SET_FSPRIVATE(bp, NULL); |
1000 | XFS_BUF_CLR_IODONE_FUNC(bp); | 1000 | XFS_BUF_CLR_IODONE_FUNC(bp); |
1001 | 1001 | xfs_biodone(bp); | |
1002 | /* | ||
1003 | * XFS_SHUT flag gets set when we go thru the | ||
1004 | * entire buffer cache and deliberately start | ||
1005 | * throwing away delayed write buffers. | ||
1006 | * Since there's no biowait done on those, | ||
1007 | * we should just brelse them. | ||
1008 | */ | ||
1009 | if (XFS_BUF_ISSHUT(bp)) { | ||
1010 | XFS_BUF_UNSHUT(bp); | ||
1011 | xfs_buf_relse(bp); | ||
1012 | } else { | ||
1013 | xfs_biodone(bp); | ||
1014 | } | ||
1015 | |||
1016 | return; | 1002 | return; |
1017 | } | 1003 | } |
1018 | 1004 | ||
diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c index 3adb868df183..5a5e035e5d38 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c | |||
@@ -2804,7 +2804,6 @@ cluster_corrupt_out: | |||
2804 | XFS_BUF_CLR_BDSTRAT_FUNC(bp); | 2804 | XFS_BUF_CLR_BDSTRAT_FUNC(bp); |
2805 | XFS_BUF_UNDONE(bp); | 2805 | XFS_BUF_UNDONE(bp); |
2806 | XFS_BUF_STALE(bp); | 2806 | XFS_BUF_STALE(bp); |
2807 | XFS_BUF_SHUT(bp); | ||
2808 | XFS_BUF_ERROR(bp,EIO); | 2807 | XFS_BUF_ERROR(bp,EIO); |
2809 | xfs_biodone(bp); | 2808 | xfs_biodone(bp); |
2810 | } else { | 2809 | } else { |