Merge tag 'for-f2fs-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk...

[karo-tx-linux.git] / fs / f2fs / data.c

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index 73713bbd464624dcd30385f984414452813855cb..a82abe921b895c7c6811f5ad9fa1a421e17b6cfd 100644 (file)
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -27,13 +27,13 @@
 #include "trace.h"
 #include <trace/events/f2fs.h>
 
-static void f2fs_read_end_io(struct bio *bio, int err)
+static void f2fs_read_end_io(struct bio *bio)
 {
        struct bio_vec *bvec;
        int i;
 
        if (f2fs_bio_encrypted(bio)) {
-               if (err) {
+               if (bio->bi_error) {
                        f2fs_release_crypto_ctx(bio->bi_private);
                } else {
                        f2fs_end_io_crypto_work(bio->bi_private, bio);
@@ -44,7 +44,7 @@ static void f2fs_read_end_io(struct bio *bio, int err)
        bio_for_each_segment_all(bvec, bio, i) {
                struct page *page = bvec->bv_page;
 
-               if (!err) {
+               if (!bio->bi_error) {
                        SetPageUptodate(page);
                } else {
                        ClearPageUptodate(page);
@@ -55,7 +55,7 @@ static void f2fs_read_end_io(struct bio *bio, int err)
        bio_put(bio);
 }
 
-static void f2fs_write_end_io(struct bio *bio, int err)
+static void f2fs_write_end_io(struct bio *bio)
 {
        struct f2fs_sb_info *sbi = bio->bi_private;
        struct bio_vec *bvec;
@@ -66,7 +66,7 @@ static void f2fs_write_end_io(struct bio *bio, int err)
 
                f2fs_restore_and_release_control_page(&page);
 
-               if (unlikely(err)) {
+               if (unlikely(bio->bi_error)) {
                        set_page_dirty(page);
                        set_bit(AS_EIO, &page->mapping->flags);
                        f2fs_stop_checkpoint(sbi);
@@ -954,7 +954,7 @@ submit_and_realloc:
                        }
 
                        bio = bio_alloc(GFP_KERNEL,
-                               min_t(int, nr_pages, bio_get_nr_vecs(bdev)));
+                               min_t(int, nr_pages, BIO_MAX_PAGES));
                        if (!bio) {
                                if (ctx)
                                        f2fs_release_crypto_ctx(ctx);