Merge tag '9p-for-5.4' of git://github.com/martinetd/linux

[linux.git] / drivers / mtd / mtdconcat.c

diff --git a/drivers/mtd/mtdconcat.c b/drivers/mtd/mtdconcat.c
index 7324ff832b41709fca7983bcd832cc72fd36e120..170a7221b35f10aa928befe40216511a12c7955e 100644 (file)
--- a/drivers/mtd/mtdconcat.c
+++ b/drivers/mtd/mtdconcat.c
@@ -437,7 +437,8 @@ static int concat_erase(struct mtd_info *mtd, struct erase_info *instr)
        return err;
 }
 
-static int concat_lock(struct mtd_info *mtd, loff_t ofs, uint64_t len)
+static int concat_xxlock(struct mtd_info *mtd, loff_t ofs, uint64_t len,
+                        bool is_lock)
 {
        struct mtd_concat *concat = CONCAT(mtd);
        int i, err = -EINVAL;
@@ -456,7 +457,10 @@ static int concat_lock(struct mtd_info *mtd, loff_t ofs, uint64_t len)
                else
                        size = len;
 
-               err = mtd_lock(subdev, ofs, size);
+               if (is_lock)
+                       err = mtd_lock(subdev, ofs, size);
+               else
+                       err = mtd_unlock(subdev, ofs, size);
                if (err)
                        break;
 
@@ -471,35 +475,33 @@ static int concat_lock(struct mtd_info *mtd, loff_t ofs, uint64_t len)
        return err;
 }
 
+static int concat_lock(struct mtd_info *mtd, loff_t ofs, uint64_t len)
+{
+       return concat_xxlock(mtd, ofs, len, true);
+}
+
 static int concat_unlock(struct mtd_info *mtd, loff_t ofs, uint64_t len)
+{
+       return concat_xxlock(mtd, ofs, len, false);
+}
+
+static int concat_is_locked(struct mtd_info *mtd, loff_t ofs, uint64_t len)
 {
        struct mtd_concat *concat = CONCAT(mtd);
-       int i, err = 0;
+       int i, err = -EINVAL;
 
        for (i = 0; i < concat->num_subdev; i++) {
                struct mtd_info *subdev = concat->subdev[i];
-               uint64_t size;
 
                if (ofs >= subdev->size) {
-                       size = 0;
                        ofs -= subdev->size;
                        continue;
                }
-               if (ofs + len > subdev->size)
-                       size = subdev->size - ofs;
-               else
-                       size = len;
-
-               err = mtd_unlock(subdev, ofs, size);
-               if (err)
-                       break;
 
-               len -= size;
-               if (len == 0)
+               if (ofs + len > subdev->size)
                        break;
 
-               err = -EINVAL;
-               ofs = 0;
+               return mtd_is_locked(subdev, ofs, len);
        }
 
        return err;
@@ -704,6 +706,7 @@ struct mtd_info *mtd_concat_create(struct mtd_info *subdev[],       /* subdevices to c
        concat->mtd._sync = concat_sync;
        concat->mtd._lock = concat_lock;
        concat->mtd._unlock = concat_unlock;
+       concat->mtd._is_locked = concat_is_locked;
        concat->mtd._suspend = concat_suspend;
        concat->mtd._resume = concat_resume;