On Thu, May 11, 2017 at 06:50:23PM +0200, Jan Kara wrote:
> Currently several places in xfs_find_get_desired_pgoff() handle the case
> of a missing page. Make them all handled in one place after the loop has
> terminated.
>
> Signed-off-by: Jan Kara <jack@xxxxxxx>
> ---
> fs/xfs/xfs_file.c | 24 ++++++++----------------
> 1 file changed, 8 insertions(+), 16 deletions(-)
>
> diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c
> index df51c025adfe..719923b99ba1 100644
> --- a/fs/xfs/xfs_file.c
> +++ b/fs/xfs/xfs_file.c
> @@ -1069,10 +1069,6 @@ xfs_find_get_desired_pgoff(
> break;
>
> ASSERT(type == HOLE_OFF);
> - if (lastoff == startoff || lastoff < endoff) {
> - found = true;
> - *offset = lastoff;
> - }
> break;
> }
Hm. This leaves the following weird looking hunk:
if (nr_pages == 0) {
/* Data search found nothing */
if (type == DATA_OFF)
break;
ASSERT(type == HOLE_OFF);
break;
}
Which could be simplified to:
if (nr_pages == 0) {
ASSERT(type == HOLE_OFF || type == DATA_OFF);
break;
}
Right? Maybe a better cleanup would be to name the enum defining
{HOLE,DATA}_OFF and change the xfs_find_get_desired_pgoff prototype to
use that enum, and then we also get compiler type checking.
The rest of this looks ok I think.
--D
> @@ -1080,11 +1076,8 @@ xfs_find_get_desired_pgoff(
> * At least we found one page. If the current offset is smaller
> * than the first page offset, a hole was found.
> */
> - if (type == HOLE_OFF && lastoff < page_offset(pvec.pages[0])) {
> - found = true;
> - *offset = lastoff;
> + if (type == HOLE_OFF && lastoff < page_offset(pvec.pages[0]))
> break;
> - }
>
> for (i = 0; i < nr_pages; i++) {
> struct page *page = pvec.pages[i];
> @@ -1150,21 +1143,20 @@ xfs_find_get_desired_pgoff(
>
> /*
> * The number of returned pages less than our desired, search
> - * done. In this case, nothing was found for searching data,
> - * but we found a hole behind the last offset.
> + * done.
> */
> - if (nr_pages < want) {
> - if (type == HOLE_OFF) {
> - *offset = lastoff;
> - found = true;
> - }
> + if (nr_pages < want)
> break;
> - }
>
> index = pvec.pages[i - 1]->index + 1;
> pagevec_release(&pvec);
> } while (index <= end);
>
> + /* No page at lastoff and we are not done - we found a hole. */
> + if (type == HOLE_OFF && lastoff < endoff) {
> + *offset = lastoff;
> + found = true;
> + }
> out:
> pagevec_release(&pvec);
> return found;
> --
> 2.12.0
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
