LU-3974 llite: invalidatepage api changed

[fs/lustre-release.git] / lustre / llite / lloop.c

diff --git a/lustre/llite/lloop.c b/lustre/llite/lloop.c
index 30a55d6..cef0de6 100644 (file)
--- a/lustre/llite/lloop.c
+++ b/lustre/llite/lloop.c
@@ -369,7 +369,7 @@ loop_make_request(struct request_queue *q, struct bio *old_bio)
         loop_add_bio(lo, old_bio);
        LL_MRF_RETURN(0);
 err:
-       cfs_bio_io_error(old_bio, old_bio->bi_size);
+       bio_io_error(old_bio);
        LL_MRF_RETURN(0);
 }
 
@@ -393,7 +393,7 @@ static inline void loop_handle_bio(struct lloop_device *lo, struct bio *bio)
         while (bio) {
                 struct bio *tmp = bio->bi_next;
                 bio->bi_next = NULL;
-                cfs_bio_endio(bio, bio->bi_size, ret);
+               bio_endio(bio, ret);
                 bio = tmp;
         }
 }
@@ -608,15 +608,21 @@ static int lo_open(struct block_device *bdev, fmode_t mode)
         return 0;
 }
 
-static int lo_release(struct gendisk *disk, fmode_t mode)
+#ifdef HAVE_BLKDEV_RELEASE_RETURN_INT
+static int
+#else
+static void
+#endif
+lo_release(struct gendisk *disk, fmode_t mode)
 {
-        struct lloop_device *lo = disk->private_data;
+       struct lloop_device *lo = disk->private_data;
 
        mutex_lock(&lo->lo_ctl_mutex);
-        --lo->lo_refcnt;
+       --lo->lo_refcnt;
        mutex_unlock(&lo->lo_ctl_mutex);
-
-        return 0;
+#ifdef HAVE_BLKDEV_RELEASE_RETURN_INT
+       return 0;
+#endif
 }
 
 /* lloop device node's ioctl function. */