X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fllite%2Flloop.c;h=48ff50b17bfc0b0419341a8f4f71b95d50d0eb62;hb=95557d5c1080f68be2c24dad9f3acf83d6fcbcf9;hp=f3bf6dea26a7c46f2d3bfa8ac3fe2ccb9a31791c;hpb=95f85ba9ed5df66a0385755be62254322fc447e1;p=fs%2Flustre-release.git

diff --git a/lustre/llite/lloop.c b/lustre/llite/lloop.c
index f3bf6de..48ff50b 100644
--- a/lustre/llite/lloop.c
+++ b/lustre/llite/lloop.c
@@ -82,6 +82,7 @@
 #include <linux/module.h>
 
 #include <linux/sched.h>
+#include <linux/kthread.h>
 #include <linux/fs.h>
 #include <linux/file.h>
 #include <linux/stat.h>
@@ -187,7 +188,8 @@ static int do_bio_lustrebacked(struct lloop_device *lo, struct bio *head)
 {
         const struct lu_env  *env   = lo->lo_env;
         struct cl_io         *io    = &lo->lo_io;
-        struct inode         *inode = lo->lo_backing_file->f_dentry->d_inode;
+	struct dentry	     *de    = lo->lo_backing_file->f_path.dentry;
+	struct inode         *inode = de->d_inode;
         struct cl_object     *obj = ll_i2info(inode)->lli_clob;
         pgoff_t               offset;
         int                   ret;
@@ -412,14 +414,21 @@ static void loop_unplug(struct request_queue *q)
 
 static inline void loop_handle_bio(struct lloop_device *lo, struct bio *bio)
 {
-        int ret;
-        ret = do_bio_lustrebacked(lo, bio);
-        while (bio) {
-                struct bio *tmp = bio->bi_next;
-                bio->bi_next = NULL;
+	int ret;
+
+	ret  = do_bio_lustrebacked(lo, bio);
+	while (bio) {
+		struct bio *tmp = bio->bi_next;
+
+		bio->bi_next = NULL;
+#ifdef HAVE_BIO_ENDIO_USES_ONE_ARG
+		bio->bi_error = ret;
+		bio_endio(bio);
+#else
 		bio_endio(bio, ret);
-                bio = tmp;
-        }
+#endif
+		bio = tmp;
+	}
 }
 
 static inline int loop_active(struct lloop_device *lo)
@@ -651,9 +660,8 @@ lo_release(struct gendisk *disk, fmode_t mode)
 static int lo_ioctl(struct block_device *bdev, fmode_t mode,
                     unsigned int cmd, unsigned long arg)
 {
-        struct lloop_device *lo = bdev->bd_disk->private_data;
-        struct inode *inode = NULL;
-        int err = 0;
+	struct lloop_device *lo = bdev->bd_disk->private_data;
+	int err = 0;
 
 	mutex_lock(&lloop_mutex);
         switch (cmd) {
@@ -664,16 +672,16 @@ static int lo_ioctl(struct block_device *bdev, fmode_t mode,
                 break;
         }
 
-        case LL_IOC_LLOOP_INFO: {
-                struct lu_fid fid;
+	case LL_IOC_LLOOP_INFO: {
+		struct inode *inode;
+		struct lu_fid fid;
 
 		if (lo->lo_backing_file == NULL) {
 			err = -ENOENT;
 			break;
 		}
-                if (inode == NULL)
-                        inode = lo->lo_backing_file->f_dentry->d_inode;
-                if (lo->lo_state == LLOOP_BOUND)
+		inode = lo->lo_backing_file->f_path.dentry->d_inode;
+		if (inode != NULL && lo->lo_state == LLOOP_BOUND)
                         fid = ll_i2info(inode)->lli_fid;
                 else
                         fid_zero(&fid);
@@ -725,10 +733,11 @@ static enum llioc_iter lloop_ioctl(struct inode *unused, struct file *file,
         CWARN("Enter llop_ioctl\n");
 
 	mutex_lock(&lloop_mutex);
-        switch (cmd) {
-        case LL_IOC_LLOOP_ATTACH: {
-                struct lloop_device *lo_free = NULL;
-                int i;
+	switch (cmd) {
+	case LL_IOC_LLOOP_ATTACH: {
+		struct inode *inode = file->f_path.dentry->d_inode;
+		struct lloop_device *lo_free = NULL;
+		int i;
 
                 for (i = 0; i < max_loop; i++, lo = NULL) {
                         lo = &loop_dev[i];
@@ -737,12 +746,12 @@ static enum llioc_iter lloop_ioctl(struct inode *unused, struct file *file,
                                         lo_free = lo;
                                 continue;
                         }
-                        if (lo->lo_backing_file->f_dentry->d_inode ==
-                            file->f_dentry->d_inode)
-                                break;
-                }
-                if (lo || !lo_free)
-                        GOTO(out, err = -EBUSY);
+			if (lo->lo_backing_file->f_path.dentry->d_inode ==
+			    inode)
+				break;
+		}
+		if (lo || !lo_free)
+			GOTO(out, err = -EBUSY);
 
                 lo = lo_free;
                 dev = MKDEV(lloop_major, lo->lo_number);
@@ -905,6 +914,7 @@ module_init(lloop_init);
 module_exit(lloop_exit);
 
 CFS_MODULE_PARM(max_loop, "i", int, 0444, "maximum of lloop_device");
-MODULE_AUTHOR("Sun Microsystems, Inc. <http://www.lustre.org/>");
+MODULE_AUTHOR("OpenSFS, Inc. <http://www.lustre.org/>");
 MODULE_DESCRIPTION("Lustre virtual block device");
+MODULE_VERSION(LUSTRE_VERSION_STRING);
 MODULE_LICENSE("GPL");