Commit aefee7f1 authored by Anand Jain's avatar Anand Jain Committed by David Sterba
Browse files

btrfs: rename err to ret in prepare_pages() 



Unify naming of return value to the preferred way.

Signed-off-by: default avatarAnand Jain <anand.jain@oracle.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 35cb2e90

fs/btrfs/file.c

+12 −12
Original line number Diff line number Diff line
@@ -915,7 +915,7 @@ static noinline int prepare_pages(struct inode *inode, struct page **pages, 
	unsigned long index = pos >> PAGE_SHIFT;

	gfp_t mask = get_prepare_gfp_flags(inode, nowait);

	fgf_t fgp_flags = get_prepare_fgp_flags(nowait);

	int err = 0;

	int ret = 0;

	int faili;



	for (i = 0; i < num_pages; i++) {
@@ -925,28 +925,28 @@ static noinline int prepare_pages(struct inode *inode, struct page **pages, 
		if (!pages[i]) {

			faili = i - 1;

			if (nowait)

				err = -EAGAIN;

				ret = -EAGAIN;

			else

				err = -ENOMEM;

				ret = -ENOMEM;

			goto fail;

		}



		err = set_page_extent_mapped(pages[i]);

		if (err < 0) {

		ret = set_page_extent_mapped(pages[i]);

		if (ret < 0) {

			faili = i;

			goto fail;

		}



		if (i == 0)

			err = prepare_uptodate_page(inode, pages[i], pos,

			ret = prepare_uptodate_page(inode, pages[i], pos,

						    force_uptodate);

		if (!err && i == num_pages - 1)

			err = prepare_uptodate_page(inode, pages[i],

		if (!ret && i == num_pages - 1)

			ret = prepare_uptodate_page(inode, pages[i],

						    pos + write_bytes, false);

		if (err) {

		if (ret) {

			put_page(pages[i]);

			if (!nowait && err == -EAGAIN) {

				err = 0;

			if (!nowait && ret == -EAGAIN) {

				ret = 0;

				goto again;

			}

			faili = i - 1;
@@ -962,7 +962,7 @@ static noinline int prepare_pages(struct inode *inode, struct page **pages, 
		put_page(pages[faili]);

		faili--;

	}

	return err;

	return ret;



}