Commit ad1ea17f authored by Eric Sandeen's avatar Eric Sandeen Committed by Nathan Scott

[XFS] pagebuf flags cleanup

SGI Modid: 2.5.x-xfs:slinx:130823a
parent ea791101
...@@ -341,7 +341,7 @@ STATIC int ...@@ -341,7 +341,7 @@ STATIC int
_pagebuf_get_pages( _pagebuf_get_pages(
page_buf_t *pb, page_buf_t *pb,
int page_count, int page_count,
int flags) page_buf_flags_t flags)
{ {
int gpf_mask = pb_to_gfp(flags); int gpf_mask = pb_to_gfp(flags);
...@@ -395,7 +395,7 @@ _pagebuf_free_object( ...@@ -395,7 +395,7 @@ _pagebuf_free_object(
pb_hash_t *hash, /* hash bucket for buffer */ pb_hash_t *hash, /* hash bucket for buffer */
page_buf_t *pb) /* buffer to deallocate */ page_buf_t *pb) /* buffer to deallocate */
{ {
int pb_flags = pb->pb_flags; page_buf_flags_t pb_flags = pb->pb_flags;
PB_TRACE(pb, PB_TRACE_REC(free_obj), 0); PB_TRACE(pb, PB_TRACE_REC(free_obj), 0);
pb->pb_flags |= PBF_FREED; pb->pb_flags |= PBF_FREED;
...@@ -828,7 +828,7 @@ pagebuf_lookup( ...@@ -828,7 +828,7 @@ pagebuf_lookup(
struct inode *inode, struct inode *inode,
loff_t ioff, loff_t ioff,
size_t isize, size_t isize,
int flags) page_buf_flags_t flags)
{ {
page_buf_t *pb = NULL; page_buf_t *pb = NULL;
...@@ -849,7 +849,7 @@ pagebuf_readahead( ...@@ -849,7 +849,7 @@ pagebuf_readahead(
pb_target_t *target, pb_target_t *target,
loff_t ioff, loff_t ioff,
size_t isize, size_t isize,
int flags) page_buf_flags_t flags)
{ {
flags |= (PBF_TRYLOCK|PBF_READ|PBF_ASYNC|PBF_MAPPABLE|PBF_READ_AHEAD); flags |= (PBF_TRYLOCK|PBF_READ|PBF_ASYNC|PBF_MAPPABLE|PBF_READ_AHEAD);
pagebuf_get(target, ioff, isize, flags); pagebuf_get(target, ioff, isize, flags);
...@@ -937,7 +937,7 @@ pagebuf_get_no_daddr( ...@@ -937,7 +937,7 @@ pagebuf_get_no_daddr(
{ {
int rval; int rval;
void *rmem = NULL; void *rmem = NULL;
int flags = _PBF_LOCKABLE | PBF_FORCEIO; page_buf_flags_t flags = _PBF_LOCKABLE | PBF_FORCEIO;
page_buf_t *pb; page_buf_t *pb;
size_t tlen = 0; size_t tlen = 0;
...@@ -1230,10 +1230,8 @@ int ...@@ -1230,10 +1230,8 @@ int
pagebuf_iostart( /* start I/O on a buffer */ pagebuf_iostart( /* start I/O on a buffer */
page_buf_t *pb, /* buffer to start */ page_buf_t *pb, /* buffer to start */
page_buf_flags_t flags) /* PBF_LOCK, PBF_ASYNC, PBF_READ, */ page_buf_flags_t flags) /* PBF_LOCK, PBF_ASYNC, PBF_READ, */
/* PBF_WRITE, PBF_ALLOCATE, */ /* PBF_WRITE, PBF_DELWRI, */
/* PBF_DELWRI, */
/* PBF_SYNC, PBF_DONT_BLOCK */ /* PBF_SYNC, PBF_DONT_BLOCK */
/* PBF_RELEASE */
{ {
int status = 0; int status = 0;
......
...@@ -240,15 +240,16 @@ extern page_buf_t *pagebuf_get( /* allocate a buffer */ ...@@ -240,15 +240,16 @@ extern page_buf_t *pagebuf_get( /* allocate a buffer */
struct pb_target *, /* inode for buffer */ struct pb_target *, /* inode for buffer */
loff_t, /* starting offset of range */ loff_t, /* starting offset of range */
size_t, /* length of range */ size_t, /* length of range */
page_buf_flags_t); /* PBF_LOCK, PBF_READ, PBF_ALLOCATE, */ page_buf_flags_t); /* PBF_LOCK, PBF_READ, */
/* PBF_ASYNC, */ /* PBF_ASYNC */
extern page_buf_t *pagebuf_lookup( extern page_buf_t *pagebuf_lookup(
struct pb_target *, struct pb_target *,
struct inode *, struct inode *,
loff_t, /* starting offset of range */ loff_t, /* starting offset of range */
size_t, /* length of range */ size_t, /* length of range */
int); /* PBF_ENTER_PAGES */ page_buf_flags_t); /* PBF_READ, PBF_WRITE, */
/* PBF_FORCEIO, _PBF_LOCKABLE */
extern page_buf_t *pagebuf_get_empty( /* allocate pagebuf struct with */ extern page_buf_t *pagebuf_get_empty( /* allocate pagebuf struct with */
/* no memory or disk address */ /* no memory or disk address */
...@@ -272,7 +273,7 @@ extern void pagebuf_readahead( /* read ahead into cache */ ...@@ -272,7 +273,7 @@ extern void pagebuf_readahead( /* read ahead into cache */
struct pb_target *, /* target for buffer (or NULL) */ struct pb_target *, /* target for buffer (or NULL) */
loff_t, /* starting offset of range */ loff_t, /* starting offset of range */
size_t, /* length of range */ size_t, /* length of range */
int); /* additional read flags */ page_buf_flags_t); /* additional read flags */
/* Writing and Releasing Buffers */ /* Writing and Releasing Buffers */
...@@ -314,10 +315,9 @@ extern void pagebuf_ioerror( /* mark buffer in error (or not) */ ...@@ -314,10 +315,9 @@ extern void pagebuf_ioerror( /* mark buffer in error (or not) */
extern int pagebuf_iostart( /* start I/O on a buffer */ extern int pagebuf_iostart( /* start I/O on a buffer */
page_buf_t *, /* buffer to start */ page_buf_t *, /* buffer to start */
page_buf_flags_t); /* PBF_LOCK, PBF_ASYNC, PBF_READ, */ page_buf_flags_t); /* PBF_LOCK, PBF_ASYNC, */
/* PBF_WRITE, PBF_ALLOCATE, */ /* PBF_READ, PBF_WRITE, */
/* PBF_DELWRI, */ /* PBF_DELWRI, PBF_SYNC */
/* PBF_SYNC */
extern int pagebuf_iorequest( /* start real I/O */ extern int pagebuf_iorequest( /* start real I/O */
page_buf_t *); /* buffer to convey to device */ page_buf_t *); /* buffer to convey to device */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment