Skip to content

Commit e9a4af2

Browse files
Christoph HellwigAndreas Gruenbacher
authored andcommitted
gfs: don't check for AOP_WRITEPAGE_ACTIVATE in gfs2_write_jdata_batch
__gfs2_jdata_write_folio can't return AOP_WRITEPAGE_ACTIVATE, so don't check for it in gfs2_write_jdata_batch. Signed-off-by: Christoph Hellwig <[email protected]> Signed-off-by: Andreas Gruenbacher <[email protected]>
1 parent 0a828c3 commit e9a4af2

File tree

1 file changed

+10
-18
lines changed

1 file changed

+10
-18
lines changed

fs/gfs2/aops.c

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -228,24 +228,16 @@ static int gfs2_write_jdata_batch(struct address_space *mapping,
228228

229229
ret = __gfs2_jdata_write_folio(folio, wbc);
230230
if (unlikely(ret)) {
231-
if (ret == AOP_WRITEPAGE_ACTIVATE) {
232-
folio_unlock(folio);
233-
ret = 0;
234-
} else {
235-
236-
/*
237-
* done_index is set past this page,
238-
* so media errors will not choke
239-
* background writeout for the entire
240-
* file. This has consequences for
241-
* range_cyclic semantics (ie. it may
242-
* not be suitable for data integrity
243-
* writeout).
244-
*/
245-
*done_index = folio_next_index(folio);
246-
ret = 1;
247-
break;
248-
}
231+
/*
232+
* done_index is set past this page, so media errors
233+
* will not choke background writeout for the entire
234+
* file. This has consequences for range_cyclic
235+
* semantics (ie. it may not be suitable for data
236+
* integrity writeout).
237+
*/
238+
*done_index = folio_next_index(folio);
239+
ret = 1;
240+
break;
249241
}
250242

251243
/*

0 commit comments

Comments
 (0)