f2fs: report the discard cmd errors properly

In case a discard_cmd is split into several bios, the dc->error
must not be overwritten once an error is reported by a bio. Also,
move it under dc->lock.

Signed-off-by: Sahitya Tummala <stummala@codeaurora.org>
Reviewed-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index 90c75822fef621d432d46d04e5e85cc0f1b3fb8f..728ff6e316acdd4caeec55a5e3d5571537a097a4 100644 (file)
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -1029,9 +1029,9 @@ static void f2fs_submit_discard_endio(struct bio *bio)
        struct discard_cmd *dc = (struct discard_cmd *)bio->bi_private;
        unsigned long flags;
 
-       dc->error = blk_status_to_errno(bio->bi_status);
-
        spin_lock_irqsave(&dc->lock, flags);
+       if (!dc->error)
+               dc->error = blk_status_to_errno(bio->bi_status);
        dc->bio_ref--;
        if (!dc->bio_ref && dc->state == D_SUBMIT) {
                dc->state = D_DONE;