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

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
...@@ -915,7 +915,7 @@ static noinline int prepare_pages(struct inode *inode, struct page **pages, ...@@ -915,7 +915,7 @@ static noinline int prepare_pages(struct inode *inode, struct page **pages,
unsigned long index = pos >> PAGE_SHIFT; unsigned long index = pos >> PAGE_SHIFT;
gfp_t mask = get_prepare_gfp_flags(inode, nowait); gfp_t mask = get_prepare_gfp_flags(inode, nowait);
fgf_t fgp_flags = get_prepare_fgp_flags(nowait); fgf_t fgp_flags = get_prepare_fgp_flags(nowait);
int err = 0; int ret = 0;
int faili; int faili;
for (i = 0; i < num_pages; i++) { for (i = 0; i < num_pages; i++) {
...@@ -925,28 +925,28 @@ static noinline int prepare_pages(struct inode *inode, struct page **pages, ...@@ -925,28 +925,28 @@ static noinline int prepare_pages(struct inode *inode, struct page **pages,
if (!pages[i]) { if (!pages[i]) {
faili = i - 1; faili = i - 1;
if (nowait) if (nowait)
err = -EAGAIN; ret = -EAGAIN;
else else
err = -ENOMEM; ret = -ENOMEM;
goto fail; goto fail;
} }
err = set_page_extent_mapped(pages[i]); ret = set_page_extent_mapped(pages[i]);
if (err < 0) { if (ret < 0) {
faili = i; faili = i;
goto fail; goto fail;
} }
if (i == 0) if (i == 0)
err = prepare_uptodate_page(inode, pages[i], pos, ret = prepare_uptodate_page(inode, pages[i], pos,
force_uptodate); force_uptodate);
if (!err && i == num_pages - 1) if (!ret && i == num_pages - 1)
err = prepare_uptodate_page(inode, pages[i], ret = prepare_uptodate_page(inode, pages[i],
pos + write_bytes, false); pos + write_bytes, false);
if (err) { if (ret) {
put_page(pages[i]); put_page(pages[i]);
if (!nowait && err == -EAGAIN) { if (!nowait && ret == -EAGAIN) {
err = 0; ret = 0;
goto again; goto again;
} }
faili = i - 1; faili = i - 1;
...@@ -962,7 +962,7 @@ static noinline int prepare_pages(struct inode *inode, struct page **pages, ...@@ -962,7 +962,7 @@ static noinline int prepare_pages(struct inode *inode, struct page **pages,
put_page(pages[faili]); put_page(pages[faili]);
faili--; faili--;
} }
return err; return ret;
} }
......
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