summaryrefslogtreecommitdiffstats
path: root/drivers/mtd
diff options
context:
space:
mode:
authorArtem Bityutskiy <Artem.Bityutskiy@nokia.com>2008-01-24 15:45:57 +0100
committerArtem Bityutskiy <Artem.Bityutskiy@nokia.com>2008-01-25 15:41:25 +0100
commit0411e7353192d7deebd4f50b9ee41974ec3a634c (patch)
tree059c8f96ee9692818f16f0761b41a63e72cb9ced /drivers/mtd
parentUBI: add layout volume information (diff)
downloadlinux-0411e7353192d7deebd4f50b9ee41974ec3a634c.tar.xz
linux-0411e7353192d7deebd4f50b9ee41974ec3a634c.zip
UBI: do not change file pointer while updating
Since we do not change semantics of seek(), changing the file pointer while updating does not make much sense. Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Diffstat (limited to 'drivers/mtd')
-rw-r--r--drivers/mtd/ubi/cdev.c4
-rw-r--r--drivers/mtd/ubi/upd.c1
2 files changed, 1 insertions, 4 deletions
diff --git a/drivers/mtd/ubi/cdev.c b/drivers/mtd/ubi/cdev.c
index a7aa123afaf6..d9bd49421cce 100644
--- a/drivers/mtd/ubi/cdev.c
+++ b/drivers/mtd/ubi/cdev.c
@@ -368,6 +368,7 @@ static ssize_t vol_cdev_write(struct file *file, const char __user *buf,
*/
count = err;
+ vol->updating = 0;
err = ubi_check_volume(ubi, vol->vol_id);
if (err < 0)
return err;
@@ -382,7 +383,6 @@ static ssize_t vol_cdev_write(struct file *file, const char __user *buf,
revoke_exclusive(desc, UBI_READWRITE);
}
- *offp += count;
return count;
}
@@ -430,8 +430,6 @@ static int vol_cdev_ioctl(struct inode *inode, struct file *file,
err = ubi_start_update(ubi, vol->vol_id, bytes);
if (bytes == 0)
revoke_exclusive(desc, UBI_READWRITE);
-
- file->f_pos = 0;
break;
}
diff --git a/drivers/mtd/ubi/upd.c b/drivers/mtd/ubi/upd.c
index e32b04d2e048..3defa579fab0 100644
--- a/drivers/mtd/ubi/upd.c
+++ b/drivers/mtd/ubi/upd.c
@@ -343,7 +343,6 @@ int ubi_more_update_data(struct ubi_device *ubi, int vol_id,
if (err == 0) {
err = to_write;
vfree(vol->upd_buf);
- vol->updating = 0;
}
}