Messages in this thread | | | Date | Mon, 21 Sep 2015 11:47:23 -0700 | From | Jaegeuk Kim <> | Subject | Re: [PATCH RESEND] f2fs:Fix error handling for calls to the function add_free_nid in the file node.c |
| |
Hello,
On Sat, Sep 19, 2015 at 11:03:47AM -0400, Nicholas Krause wrote: > This fixes error handling for calls to the function add_free_nid > in the functions __flush_nat_entry_set and build_free_nids to > properly check if their call to this particular function return > a error code and if so break out these function's for loops as > we cannot continue these loops if these function calls fail in > > Signed-off-by: Nicholas Krause <xerofoify@gmail.com> > --- > fs/f2fs/node.c | 12 ++++++++---- > 1 file changed, 8 insertions(+), 4 deletions(-) > > diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c > index 7dd63b7..1a3fb57 100644 > --- a/fs/f2fs/node.c > +++ b/fs/f2fs/node.c > @@ -1545,8 +1545,10 @@ static void build_free_nids(struct f2fs_sb_info *sbi) > for (i = 0; i < nats_in_cursum(sum); i++) { > block_t addr = le32_to_cpu(nat_in_journal(sum, i).block_addr); > nid = le32_to_cpu(nid_in_journal(sum, i)); > - if (addr == NULL_ADDR) > - add_free_nid(sbi, nid, true); > + if (addr == NULL_ADDR) { > + if (add_free_nid(sbi, nid, true) < 0) > + break;
This is not an error case, which we must not break here.
> + } > else > remove_free_nid(nm_i, nid); > } > @@ -1879,8 +1881,10 @@ static void __flush_nat_entry_set(struct f2fs_sb_info *sbi, > __clear_nat_cache_dirty(NM_I(sbi), ne); > up_write(&NM_I(sbi)->nat_tree_lock); > > - if (nat_get_blkaddr(ne) == NULL_ADDR) > - add_free_nid(sbi, nid, false); > + if (nat_get_blkaddr(ne) == NULL_ADDR) { > + if (add_free_nid(sbi, nid, false) < 0) > + break;
ditto.
Thanks,
> + } > } > > if (to_journal) > -- > 2.1.4
| |