xfs: simplify xfs_buf_get / xfs_buf_read interfaces
Currently the low-level buffer cache interfaces are highly confusing as we have a _flags variant of each that does actually respect the flags, and one without _flags which has a flags argument that gets ignored and overriden with a default set. Given that very few places use the default arguments get rid of the duplication and convert all callers to pass the flags explicitly. Also remove the now confusing _flags postfix. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Dave Chinner <david@fromorbit.com> Signed-off-by: Alex Elder <aelder@sgi.com>
This commit is contained in:

committed by
Alex Elder

parent
c355c656fe
commit
6ad112bfb5
@@ -582,7 +582,7 @@ found:
|
||||
* although backing storage may not be.
|
||||
*/
|
||||
xfs_buf_t *
|
||||
xfs_buf_get_flags(
|
||||
xfs_buf_get(
|
||||
xfs_buftarg_t *target,/* target for buffer */
|
||||
xfs_off_t ioff, /* starting offset of range */
|
||||
size_t isize, /* length of range */
|
||||
@@ -661,7 +661,7 @@ _xfs_buf_read(
|
||||
}
|
||||
|
||||
xfs_buf_t *
|
||||
xfs_buf_read_flags(
|
||||
xfs_buf_read(
|
||||
xfs_buftarg_t *target,
|
||||
xfs_off_t ioff,
|
||||
size_t isize,
|
||||
@@ -671,7 +671,7 @@ xfs_buf_read_flags(
|
||||
|
||||
flags |= XBF_READ;
|
||||
|
||||
bp = xfs_buf_get_flags(target, ioff, isize, flags);
|
||||
bp = xfs_buf_get(target, ioff, isize, flags);
|
||||
if (bp) {
|
||||
if (!XFS_BUF_ISDONE(bp)) {
|
||||
XB_TRACE(bp, "read", (unsigned long)flags);
|
||||
@@ -718,7 +718,7 @@ xfs_buf_readahead(
|
||||
return;
|
||||
|
||||
flags |= (XBF_TRYLOCK|XBF_ASYNC|XBF_READ_AHEAD);
|
||||
xfs_buf_read_flags(target, ioff, isize, flags);
|
||||
xfs_buf_read(target, ioff, isize, flags);
|
||||
}
|
||||
|
||||
xfs_buf_t *
|
||||
|
@@ -186,15 +186,10 @@ extern xfs_buf_t *_xfs_buf_find(xfs_buftarg_t *, xfs_off_t, size_t,
|
||||
#define xfs_incore(buftarg,blkno,len,lockit) \
|
||||
_xfs_buf_find(buftarg, blkno ,len, lockit, NULL)
|
||||
|
||||
extern xfs_buf_t *xfs_buf_get_flags(xfs_buftarg_t *, xfs_off_t, size_t,
|
||||
extern xfs_buf_t *xfs_buf_get(xfs_buftarg_t *, xfs_off_t, size_t,
|
||||
xfs_buf_flags_t);
|
||||
#define xfs_buf_get(target, blkno, len, flags) \
|
||||
xfs_buf_get_flags((target), (blkno), (len), XBF_LOCK | XBF_MAPPED)
|
||||
|
||||
extern xfs_buf_t *xfs_buf_read_flags(xfs_buftarg_t *, xfs_off_t, size_t,
|
||||
extern xfs_buf_t *xfs_buf_read(xfs_buftarg_t *, xfs_off_t, size_t,
|
||||
xfs_buf_flags_t);
|
||||
#define xfs_buf_read(target, blkno, len, flags) \
|
||||
xfs_buf_read_flags((target), (blkno), (len), XBF_LOCK | XBF_MAPPED)
|
||||
|
||||
extern xfs_buf_t *xfs_buf_get_empty(size_t, xfs_buftarg_t *);
|
||||
extern xfs_buf_t *xfs_buf_get_noaddr(size_t, xfs_buftarg_t *);
|
||||
|
Reference in New Issue
Block a user