Skip to content

Commit 86b3d5f

Browse files
Matthew Wilcox (Oracle)brauner
authored andcommitted
orangefs: Remove calls to set/clear the error flag
Nobody checks the error flag on orangefs folios, so stop setting and clearing it. We can also use folio_end_read() to simplify orangefs_read_folio(). Cc: Martin Brandenburg <[email protected]> Cc: [email protected] Signed-off-by: Matthew Wilcox (Oracle) <[email protected]> Link: https://lore.kernel.org/r/[email protected] Tested-by: Mike Marshall <[email protected]> Signed-off-by: Christian Brauner <[email protected]>
1 parent 8f3ab6e commit 86b3d5f

File tree

2 files changed

+4
-13
lines changed

2 files changed

+4
-13
lines changed

fs/orangefs/inode.c

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ static int orangefs_writepage_locked(struct page *page,
5656
ret = wait_for_direct_io(ORANGEFS_IO_WRITE, inode, &off, &iter, wlen,
5757
len, wr, NULL, NULL);
5858
if (ret < 0) {
59-
SetPageError(page);
6059
mapping_set_error(page->mapping, ret);
6160
} else {
6261
ret = 0;
@@ -119,7 +118,6 @@ static int orangefs_writepages_work(struct orangefs_writepages *ow,
119118
0, &wr, NULL, NULL);
120119
if (ret < 0) {
121120
for (i = 0; i < ow->npages; i++) {
122-
SetPageError(ow->pages[i]);
123121
mapping_set_error(ow->pages[i]->mapping, ret);
124122
if (PagePrivate(ow->pages[i])) {
125123
wrp = (struct orangefs_write_range *)
@@ -303,15 +301,10 @@ static int orangefs_read_folio(struct file *file, struct folio *folio)
303301
iov_iter_zero(~0U, &iter);
304302
/* takes care of potential aliasing */
305303
flush_dcache_folio(folio);
306-
if (ret < 0) {
307-
folio_set_error(folio);
308-
} else {
309-
folio_mark_uptodate(folio);
304+
if (ret > 0)
310305
ret = 0;
311-
}
312-
/* unlock the folio after the ->read_folio() routine completes */
313-
folio_unlock(folio);
314-
return ret;
306+
folio_end_read(folio, ret == 0);
307+
return ret;
315308
}
316309

317310
static int orangefs_write_begin(struct file *file,

fs/orangefs/orangefs-bufmap.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -274,10 +274,8 @@ orangefs_bufmap_map(struct orangefs_bufmap *bufmap,
274274
gossip_err("orangefs error: asked for %d pages, only got %d.\n",
275275
bufmap->page_count, ret);
276276

277-
for (i = 0; i < ret; i++) {
278-
SetPageError(bufmap->page_array[i]);
277+
for (i = 0; i < ret; i++)
279278
unpin_user_page(bufmap->page_array[i]);
280-
}
281279
return -ENOMEM;
282280
}
283281

0 commit comments

Comments
 (0)