projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'drm-next-2022-08-12-1' of git://anongit.freedesktop.org/drm/drm
[linux-2.6-microblaze.git]
/
fs
/
gfs2
/
log.c
diff --git
a/fs/gfs2/log.c
b/fs/gfs2/log.c
index
eec4159
..
7236393
100644
(file)
--- a/
fs/gfs2/log.c
+++ b/
fs/gfs2/log.c
@@
-131,7
+131,7
@@
__acquires(&sdp->sd_ail_lock)
if (!mapping)
continue;
spin_unlock(&sdp->sd_ail_lock);
if (!mapping)
continue;
spin_unlock(&sdp->sd_ail_lock);
- ret =
generic_writepages
(mapping, wbc);
+ ret =
filemap_fdatawrite_wbc
(mapping, wbc);
if (need_resched()) {
blk_finish_plug(plug);
cond_resched();
if (need_resched()) {
blk_finish_plug(plug);
cond_resched();
@@
-222,8
+222,7
@@
out:
spin_unlock(&sdp->sd_ail_lock);
blk_finish_plug(&plug);
if (ret) {
spin_unlock(&sdp->sd_ail_lock);
blk_finish_plug(&plug);
if (ret) {
- gfs2_lm(sdp, "gfs2_ail1_start_one (generic_writepages) "
- "returned: %d\n", ret);
+ gfs2_lm(sdp, "gfs2_ail1_start_one returned: %d\n", ret);
gfs2_withdraw(sdp);
}
trace_gfs2_ail_flush(sdp, wbc, 0);
gfs2_withdraw(sdp);
}
trace_gfs2_ail_flush(sdp, wbc, 0);