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

Commit 38d9aefb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6 

* 'linux-next' of git://git.infradead.org/ubi-2.6:
  UBI: add fsync capability
parents 432870da 1b24bc3a

drivers/mtd/ubi/cdev.c

+11 −0
Original line number Diff line number Diff line
@@ -186,6 +186,16 @@ static loff_t vol_cdev_llseek(struct file *file, loff_t offset, int origin) 
	return new_offset;

}



static int vol_cdev_fsync(struct file *file, struct dentry *dentry,

			  int datasync)

{

	struct ubi_volume_desc *desc = file->private_data;

	struct ubi_device *ubi = desc->vol->ubi;



	return ubi_sync(ubi->ubi_num);

}





static ssize_t vol_cdev_read(struct file *file, __user char *buf, size_t count,

			     loff_t *offp)

{
@@ -1073,6 +1083,7 @@ const struct file_operations ubi_vol_cdev_operations = { 
	.llseek         = vol_cdev_llseek,

	.read           = vol_cdev_read,

	.write          = vol_cdev_write,

	.fsync		= vol_cdev_fsync,

	.unlocked_ioctl = vol_cdev_ioctl,

	.compat_ioctl   = vol_cdev_compat_ioctl,

};