summaryrefslogtreecommitdiffstats
path: root/drivers/mtd
diff options
context:
space:
mode:
authorLinus Torvalds2009-04-07 00:00:00 +0200
committerLinus Torvalds2009-04-07 00:00:00 +0200
commit38d9aefb5ce8f26358b0d5cd933cfa9e267105b1 (patch)
treef0fd3b7ef2560f1e06ec0557a3de1fa4401563bc /drivers/mtd
parentexit_notify: kill the wrong capable(CAP_KILL) check (diff)
parentUBI: add fsync capability (diff)
downloadkernel-qcow2-linux-38d9aefb5ce8f26358b0d5cd933cfa9e267105b1.tar.gz
kernel-qcow2-linux-38d9aefb5ce8f26358b0d5cd933cfa9e267105b1.tar.xz
kernel-qcow2-linux-38d9aefb5ce8f26358b0d5cd933cfa9e267105b1.zip
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
Diffstat (limited to 'drivers/mtd')
-rw-r--r--drivers/mtd/ubi/cdev.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/mtd/ubi/cdev.c b/drivers/mtd/ubi/cdev.c
index e63c8fc3df3a..f8e0f68f2186 100644
--- a/drivers/mtd/ubi/cdev.c
+++ b/drivers/mtd/ubi/cdev.c
@@ -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,
};