summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-07-07 15:32:17 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2016-07-07 15:32:17 -0700
commit4c2a8499a450b6582eb5637a8f0d472168355ddd (patch)
treeb4f60c5e16f4831e495121f6e8faaf19d4e6b01c /fs
parent076501ff6ba265a473689c112eda9f1f34f620b5 (diff)
parentf8608985f851c917b3884b692d8e326b0210d34e (diff)
downloadlinux-4c2a8499a450b6582eb5637a8f0d472168355ddd.tar.bz2
Merge tag 'configfs-for-4.7' of git://git.infradead.org/users/hch/configfs
Pull configfs fix from Christoph Hellwig: "A fix from Marek for ppos handling in configfs_write_bin_file, which was introduced in Linux 4.5, but didn't have any users until recently" * tag 'configfs-for-4.7' of git://git.infradead.org/users/hch/configfs: configfs: Remove ppos increment in configfs_write_bin_file
Diffstat (limited to 'fs')
-rw-r--r--fs/configfs/file.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/configfs/file.c b/fs/configfs/file.c
index 33b7ee34eda5..bbc1252a59f5 100644
--- a/fs/configfs/file.c
+++ b/fs/configfs/file.c
@@ -357,8 +357,6 @@ configfs_write_bin_file(struct file *file, const char __user *buf,
len = simple_write_to_buffer(buffer->bin_buffer,
buffer->bin_buffer_size, ppos, buf, count);
- if (len > 0)
- *ppos += len;
out:
mutex_unlock(&buffer->mutex);
return len;