mirror of
https://github.com/torvalds/linux.git
synced 2026-07-27 01:32:21 +02:00
ceph: fix writeback_count leak in write_folio_nounlock()
write_folio_nounlock() increments fsc->writeback_count to track
in-flight writeback operations. On several error paths where the
function returns early (folio lookup failure, snapshot context
allocation failure, and writepages submission failure), the function
returns without calling atomic_long_dec_return() to decrement the
counter.
Each leaked increment keeps the counter above zero, which can prevent
the filesystem from cleanly unmounting or suspending writes.
Add atomic_long_dec_return() calls on all error paths that currently
return without decrementing the counter.
Cc: stable@vger.kernel.org
Fixes: d55207717d ("ceph: add encryption support to writepage and writepages")
Signed-off-by: Wentao Liang <vulab@iscas.ac.cn>
Reviewed-by: Viacheslav Dubeyko <Slava.Dubeyko@ibm.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
This commit is contained in:
parent
a109a55611
commit
cbf59617cd
|
|
@ -790,6 +790,9 @@ static int write_folio_nounlock(struct folio *folio,
|
|||
ceph_wbc.truncate_size, true);
|
||||
if (IS_ERR(req)) {
|
||||
folio_redirty_for_writepage(wbc, folio);
|
||||
if (atomic_long_dec_return(&fsc->writeback_count) <
|
||||
CONGESTION_OFF_THRESH(fsc->mount_options->congestion_kb))
|
||||
fsc->write_congested = false;
|
||||
return PTR_ERR(req);
|
||||
}
|
||||
|
||||
|
|
@ -809,6 +812,9 @@ static int write_folio_nounlock(struct folio *folio,
|
|||
folio_redirty_for_writepage(wbc, folio);
|
||||
folio_end_writeback(folio);
|
||||
ceph_osdc_put_request(req);
|
||||
if (atomic_long_dec_return(&fsc->writeback_count) <
|
||||
CONGESTION_OFF_THRESH(fsc->mount_options->congestion_kb))
|
||||
fsc->write_congested = false;
|
||||
return PTR_ERR(bounce_page);
|
||||
}
|
||||
}
|
||||
|
|
@ -847,6 +853,9 @@ static int write_folio_nounlock(struct folio *folio,
|
|||
ceph_vinop(inode), folio);
|
||||
folio_redirty_for_writepage(wbc, folio);
|
||||
folio_end_writeback(folio);
|
||||
if (atomic_long_dec_return(&fsc->writeback_count) <
|
||||
CONGESTION_OFF_THRESH(fsc->mount_options->congestion_kb))
|
||||
fsc->write_congested = false;
|
||||
return err;
|
||||
}
|
||||
if (err == -EBLOCKLISTED)
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user