Commit 16275ea4 authored by Nathan Scott's avatar Nathan Scott

[XFS] Fix some comments, remove an unused variable from the stack, fix missing

clear of pb_locking field if IO completion handled in pagebuf_iorequest.

SGI Modid: 2.5.x-xfs:slinx:140047a
parent cb6c573f
...@@ -704,8 +704,7 @@ _pagebuf_find( /* find buffer for block */ ...@@ -704,8 +704,7 @@ _pagebuf_find( /* find buffer for block */
* are in memory. The buffer may have unallocated holes, if * are in memory. The buffer may have unallocated holes, if
* some, but not all, of the blocks are in memory. Even where * some, but not all, of the blocks are in memory. Even where
* pages are present in the buffer, not all of every page may be * pages are present in the buffer, not all of every page may be
* valid. The file system may use pagebuf_segment to visit the * valid.
* various segments of the buffer.
*/ */
page_buf_t * page_buf_t *
pagebuf_find( /* find buffer for block */ pagebuf_find( /* find buffer for block */
...@@ -722,11 +721,10 @@ pagebuf_find( /* find buffer for block */ ...@@ -722,11 +721,10 @@ pagebuf_find( /* find buffer for block */
* pagebuf_get * pagebuf_get
* *
* pagebuf_get assembles a buffer covering the specified range. * pagebuf_get assembles a buffer covering the specified range.
* Some or all of the blocks in the range may be valid. The file * Some or all of the blocks in the range may be valid. Storage
* system may use pagebuf_segment to visit the various segments * in memory for all portions of the buffer will be allocated,
* of the buffer. Storage in memory for all portions of the * although backing storage may not be. If PBF_READ is set in
* buffer will be allocated, although backing storage may not be. * flags, pagebuf_iostart is called also.
* If PBF_READ is set in flags, pagebuf_read
*/ */
page_buf_t * page_buf_t *
pagebuf_get( /* allocate a buffer */ pagebuf_get( /* allocate a buffer */
...@@ -1201,8 +1199,10 @@ pagebuf_iostart( /* start I/O on a buffer */ ...@@ -1201,8 +1199,10 @@ pagebuf_iostart( /* start I/O on a buffer */
return status; return status;
} }
pb->pb_flags &= ~(PBF_READ|PBF_WRITE|PBF_ASYNC|PBF_DELWRI|PBF_READ_AHEAD); pb->pb_flags &=
pb->pb_flags |= flags & (PBF_READ|PBF_WRITE|PBF_ASYNC|PBF_SYNC|PBF_READ_AHEAD); ~(PBF_READ|PBF_WRITE|PBF_ASYNC|PBF_DELWRI|PBF_READ_AHEAD);
pb->pb_flags |= flags &
(PBF_READ|PBF_WRITE|PBF_ASYNC|PBF_SYNC|PBF_READ_AHEAD);
BUG_ON(pb->pb_bn == PAGE_BUF_DADDR_NULL); BUG_ON(pb->pb_bn == PAGE_BUF_DADDR_NULL);
...@@ -1299,7 +1299,6 @@ int ...@@ -1299,7 +1299,6 @@ int
pagebuf_iorequest( /* start real I/O */ pagebuf_iorequest( /* start real I/O */
page_buf_t *pb) /* buffer to convey to device */ page_buf_t *pb) /* buffer to convey to device */
{ {
int status = 0;
int i, map_i, total_nr_pages, nr_pages; int i, map_i, total_nr_pages, nr_pages;
struct bio *bio; struct bio *bio;
int offset = pb->pb_offset; int offset = pb->pb_offset;
...@@ -1314,7 +1313,7 @@ pagebuf_iorequest( /* start real I/O */ ...@@ -1314,7 +1313,7 @@ pagebuf_iorequest( /* start real I/O */
if (pb->pb_flags & PBF_DELWRI) { if (pb->pb_flags & PBF_DELWRI) {
pagebuf_delwri_queue(pb, 1); pagebuf_delwri_queue(pb, 1);
return status; return 0;
} }
/* Set the count to 1 initially, this will stop an I/O /* Set the count to 1 initially, this will stop an I/O
...@@ -1414,10 +1413,11 @@ pagebuf_iorequest( /* start real I/O */ ...@@ -1414,10 +1413,11 @@ pagebuf_iorequest( /* start real I/O */
io_submitted: io_submitted:
if (atomic_dec_and_test(&pb->pb_io_remaining) == 1) { if (atomic_dec_and_test(&pb->pb_io_remaining) == 1) {
pb->pb_locked = 0;
pagebuf_iodone(pb, 0); pagebuf_iodone(pb, 0);
} }
return status < 0 ? status : 0; return 0;
} }
/* /*
......
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