Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=0411e7353192d7deebd4f50b9ee41974ec3a634c
Commit:     0411e7353192d7deebd4f50b9ee41974ec3a634c
Parent:     91f2d53cd75a8fa3557246af965155208c4c69a7
Author:     Artem Bityutskiy <[EMAIL PROTECTED]>
AuthorDate: Thu Jan 24 16:45:57 2008 +0200
Committer:  Artem Bityutskiy <[EMAIL PROTECTED]>
CommitDate: Fri Jan 25 16:41:25 2008 +0200

    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 <[EMAIL PROTECTED]>
---
 drivers/mtd/ubi/cdev.c |    4 +---
 drivers/mtd/ubi/upd.c  |    1 -
 2 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/drivers/mtd/ubi/cdev.c b/drivers/mtd/ubi/cdev.c
index a7aa123..d9bd494 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 e32b04d..3defa57 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;
                }
        }
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to