diff options
| author | Ryusuke Konishi | 2010-03-22 11:33:43 +0100 |
|---|---|---|
| committer | Ryusuke Konishi | 2010-03-23 17:17:20 +0100 |
| commit | d067633b4483f3c7d971d8f889f35340a8635bb5 (patch) | |
| tree | 4b27e195b6006b1fffe8c952d0a208b1e0491583 | |
| parent | nilfs2: fix hang-up of cleaner after log writer returned with error (diff) | |
| download | kernel-qcow2-linux-d067633b4483f3c7d971d8f889f35340a8635bb5.tar.gz kernel-qcow2-linux-d067633b4483f3c7d971d8f889f35340a8635bb5.tar.xz kernel-qcow2-linux-d067633b4483f3c7d971d8f889f35340a8635bb5.zip | |
nilfs2: fix imperfect completion wait in nilfs_wait_on_logs
nilfs_wait_on_logs has a potential to slip out before completion of
all bio requests when it met an error. This synchronization fault may
cause unexpected results, for instance, violative access to freed
segment buffers from an end-bio callback routine.
This fixes the issue by ensuring that nilfs_wait_on_logs waits all
given logs.
Signed-off-by: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
| -rw-r--r-- | fs/nilfs2/segbuf.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/nilfs2/segbuf.c b/fs/nilfs2/segbuf.c index 636eaafd6ea2..6129a431aa34 100644 --- a/fs/nilfs2/segbuf.c +++ b/fs/nilfs2/segbuf.c @@ -323,14 +323,14 @@ int nilfs_write_logs(struct list_head *logs, struct the_nilfs *nilfs) int nilfs_wait_on_logs(struct list_head *logs) { struct nilfs_segment_buffer *segbuf; - int err; + int err, ret = 0; list_for_each_entry(segbuf, logs, sb_list) { err = nilfs_segbuf_wait(segbuf); - if (err) - return err; + if (err && !ret) + ret = err; } - return 0; + return ret; } /* |