Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 37edcbcb authored by Al Viro's avatar Al Viro Committed by Tatyana Brokhman
Browse files

ubi/cdev: switch to fixed_size_llseek() 



Change-Id: I5644a2742b12adb58f27743d68761ef2bf06016a
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Git-commit: 4a1f2f386b0011782099b4393ee74370916b
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git


Signed-off-by: default avatarTatyana Brokhman <tlinder@codeaurora.org>
parent c007c75a

drivers/mtd/ubi/cdev.c

+1 −25
Original line number Diff line number Diff line
@@ -155,7 +155,6 @@ static loff_t vol_cdev_llseek(struct file *file, loff_t offset, int origin) 
{

	struct ubi_volume_desc *desc = file->private_data;

	struct ubi_volume *vol = desc->vol;

	loff_t new_offset;



	if (vol->updating) {

		/* Update is in progress, seeking is prohibited */
@@ -163,30 +162,7 @@ static loff_t vol_cdev_llseek(struct file *file, loff_t offset, int origin) 
		return -EBUSY;

	}



	switch (origin) {

	case 0: /* SEEK_SET */

		new_offset = offset;

		break;

	case 1: /* SEEK_CUR */

		new_offset = file->f_pos + offset;

		break;

	case 2: /* SEEK_END */

		new_offset = vol->used_bytes + offset;

		break;

	default:

		return -EINVAL;

	}



	if (new_offset < 0 || new_offset > vol->used_bytes) {

		ubi_err("bad seek %lld", new_offset);

		return -EINVAL;

	}



	dbg_gen("seek volume %d, offset %lld, origin %d, new offset %lld",

		vol->vol_id, offset, origin, new_offset);



	file->f_pos = new_offset;

	return new_offset;

	return fixed_size_llseek(file, offset, origin, vol->used_bytes);

}



static int vol_cdev_fsync(struct file *file, loff_t start, loff_t end,