LU-8210 osd-ldiskfs: fix setting pages PageUptodate state

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

diff --git a/lustre/llite/lloop.c b/lustre/llite/lloop.c
index 9b0cf65..b8ae0b5 100644 (file)
--- a/lustre/llite/lloop.c
+++ b/lustre/llite/lloop.c
@@ -226,7 +226,7 @@ static int do_bio_lustrebacked(struct lloop_device *lo, struct bio *head)
 
 #ifdef HAVE_BVEC_ITER
                offset = (pgoff_t)(bio->bi_iter.bi_sector << 9) + lo->lo_offset;
-               bio_for_each_segment(bvec, bio, iter) {
+               bio_for_each_segment_all(bvec, bio, iter) {
                        BUG_ON(bvec.bv_offset != 0);
                        BUG_ON(bvec.bv_len != PAGE_CACHE_SIZE);
 
@@ -236,7 +236,7 @@ static int do_bio_lustrebacked(struct lloop_device *lo, struct bio *head)
                        offset += bvec.bv_len;
 #else
                offset = (pgoff_t)(bio->bi_sector << 9) + lo->lo_offset;
-               bio_for_each_segment(bvec, bio, iter) {
+               bio_for_each_segment_all(bvec, bio, iter) {
                        BUG_ON(bvec->bv_offset != 0);
                        BUG_ON(bvec->bv_len != PAGE_CACHE_SIZE);
 
@@ -450,7 +450,7 @@ static int loop_thread(void *data)
         unsigned long total_count = 0;
 
         struct lu_env *env;
-        int refcheck;
+       __u16 refcheck;
         int ret = 0;
 
         set_user_nice(current, -20);
@@ -894,26 +894,28 @@ out_mem1:
         return -ENOMEM;
 }
 
-static void lloop_exit(void)
+static void __exit lloop_exit(void)
 {
-        int i;
+       int i;
 
-        ll_iocontrol_unregister(ll_iocontrol_magic);
-        for (i = 0; i < max_loop; i++) {
-                del_gendisk(disks[i]);
-                blk_cleanup_queue(loop_dev[i].lo_queue);
-                put_disk(disks[i]);
-        }
+       ll_iocontrol_unregister(ll_iocontrol_magic);
+       for (i = 0; i < max_loop; i++) {
+               del_gendisk(disks[i]);
+               blk_cleanup_queue(loop_dev[i].lo_queue);
+               put_disk(disks[i]);
+       }
        unregister_blkdev(lloop_major, "lloop");
 
-        OBD_FREE(disks, max_loop * sizeof(*disks));
-        OBD_FREE(loop_dev, max_loop * sizeof(*loop_dev));
+       OBD_FREE(disks, max_loop * sizeof(*disks));
+       OBD_FREE(loop_dev, max_loop * sizeof(*loop_dev));
 }
 
-module_init(lloop_init);
-module_exit(lloop_exit);
-
-CFS_MODULE_PARM(max_loop, "i", int, 0444, "maximum of lloop_device");
+module_param(max_loop, int, 0444);
+MODULE_PARM_DESC(max_loop, "maximum of lloop_device");
 MODULE_AUTHOR("OpenSFS, Inc. <http://www.lustre.org/>");
 MODULE_DESCRIPTION("Lustre virtual block device");
+MODULE_VERSION(LUSTRE_VERSION_STRING);
 MODULE_LICENSE("GPL");
+
+module_init(lloop_init);
+module_exit(lloop_exit);