diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-02-09 19:22:17 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-02-09 19:22:17 -0800 |
commit | 878e66d06fd098a744b9caafdd0e99bba415ce37 (patch) | |
tree | 71a5cceab7713eb01b1a15a544124dbe2f6e07fc /fs/kernfs | |
parent | c839682c719f0e3dc851951c9e2eeb8a41cd9609 (diff) | |
parent | cf5eebae2cd28d37581507668605f4d23cd7218d (diff) | |
download | op-kernel-dev-878e66d06fd098a744b9caafdd0e99bba415ce37.zip op-kernel-dev-878e66d06fd098a744b9caafdd0e99bba415ce37.tar.gz |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull misc vfs fixes from Al Viro.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
seq_file: fix incomplete reset on read from zero offset
kernfs: fix regression in kernfs_fop_write caused by wrong type
Diffstat (limited to 'fs/kernfs')
-rw-r--r-- | fs/kernfs/file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/kernfs/file.c b/fs/kernfs/file.c index c53d9cc..a03ce34 100644 --- a/fs/kernfs/file.c +++ b/fs/kernfs/file.c @@ -275,7 +275,7 @@ static ssize_t kernfs_fop_write(struct file *file, const char __user *user_buf, { struct kernfs_open_file *of = kernfs_of(file); const struct kernfs_ops *ops; - size_t len; + ssize_t len; char *buf; if (of->atomic_write_len) { |