diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2016-02-24 14:00:26 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-02-24 14:00:26 -0800 |
| commit | aa263c43fee300af018aec437dbd64570ec65825 (patch) | |
| tree | 2fc8a31f058764395bb063e85905fe7d38fcfa5b /fs/read_write.c | |
| parent | thp: call pmdp_invalidate() with correct virtual address (diff) | |
| parent | fs/pnode.c: treat zero mnt_group_id-s as unequal (diff) | |
| download | linux-dev-aa263c43fee300af018aec437dbd64570ec65825.tar.xz linux-dev-aa263c43fee300af018aec437dbd64570ec65825.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull vfs fixes from Al Viro:
"Assorted fixes - xattr one from this cycle, the rest - stable fodder"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
fs/pnode.c: treat zero mnt_group_id-s as unequal
affs_do_readpage_ofs(): just use kmap_atomic() around memcpy()
xattr handlers: plug a lock leak in simple_xattr_list
fs: allow no_seek_end_llseek to actually seek
Diffstat (limited to 'fs/read_write.c')
| -rw-r--r-- | fs/read_write.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/read_write.c b/fs/read_write.c index 324ec271cc4e..0c8782aa3d71 100644 --- a/fs/read_write.c +++ b/fs/read_write.c @@ -17,6 +17,7 @@ #include <linux/splice.h> #include <linux/compat.h> #include <linux/mount.h> +#include <linux/fs.h> #include "internal.h" #include <asm/uaccess.h> @@ -183,7 +184,7 @@ loff_t no_seek_end_llseek(struct file *file, loff_t offset, int whence) switch (whence) { case SEEK_SET: case SEEK_CUR: return generic_file_llseek_size(file, offset, whence, - ~0ULL, 0); + OFFSET_MAX, 0); default: return -EINVAL; } |