diff options
| author | Christoph Hellwig <hch@infradead.org> | 2010-01-19 09:56:44 +0000 |
|---|---|---|
| committer | Alex Elder <aelder@sgi.com> | 2010-01-21 13:44:36 -0600 |
| commit | 0cadda1c5f194f98a05d252ff4385d86d2ed0862 (patch) | |
| tree | a299a7a976f1478f9024f1d3aff9a2351a8397fe /fs/xfs/xfs_btree.c | |
| parent | a210c1aa7f6c90b729cc3a72d03e789b13cb6c47 (diff) | |
| download | linux-stable-0cadda1c5f194f98a05d252ff4385d86d2ed0862.tar.gz linux-stable-0cadda1c5f194f98a05d252ff4385d86d2ed0862.tar.bz2 linux-stable-0cadda1c5f194f98a05d252ff4385d86d2ed0862.zip | |
xfs: remove duplicate buffer flags
Currently we define aliases for the buffer flags in various
namespaces, which only adds confusion. Remove all but the XBF_
flags to clean this up a bit.
Note that we still abuse XFS_B_ASYNC/XBF_ASYNC for some non-buffer
uses, but I'll clean that up later.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Dave Chinner <david@fromorbit.com>
Signed-off-by: Alex Elder <aelder@sgi.com>
Diffstat (limited to 'fs/xfs/xfs_btree.c')
| -rw-r--r-- | fs/xfs/xfs_btree.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/xfs/xfs_btree.c b/fs/xfs/xfs_btree.c index 36a0992dd669..96be4b0f2496 100644 --- a/fs/xfs/xfs_btree.c +++ b/fs/xfs/xfs_btree.c @@ -977,7 +977,7 @@ xfs_btree_get_buf_block( xfs_daddr_t d; /* need to sort out how callers deal with failures first */ - ASSERT(!(flags & XFS_BUF_TRYLOCK)); + ASSERT(!(flags & XBF_TRYLOCK)); d = xfs_btree_ptr_to_daddr(cur, ptr); *bpp = xfs_trans_get_buf(cur->bc_tp, mp->m_ddev_targp, d, @@ -1008,7 +1008,7 @@ xfs_btree_read_buf_block( int error; /* need to sort out how callers deal with failures first */ - ASSERT(!(flags & XFS_BUF_TRYLOCK)); + ASSERT(!(flags & XBF_TRYLOCK)); d = xfs_btree_ptr_to_daddr(cur, ptr); error = xfs_trans_read_buf(mp, cur->bc_tp, mp->m_ddev_targp, d, |