diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2014-02-01 10:43:45 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-02-01 10:43:45 -0800 |
| commit | efc518eb318c4d776933c23e7b82c2e5402b62de (patch) | |
| tree | ee9100af7dd17039524c7833e0128de49eab5be1 /include/linux | |
| parent | Merge tag 'staging-3.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging (diff) | |
| parent | Fix mountpoint reference leakage in linkat (diff) | |
| download | linux-dev-efc518eb318c4d776933c23e7b82c2e5402b62de.tar.xz linux-dev-efc518eb318c4d776933c23e7b82c2e5402b62de.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull vfs fixes from Al Viro:
"Several obvious fixes"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
Fix mountpoint reference leakage in linkat
hfsplus: use xattr handlers for removexattr
Typo in compat_sys_lseek() declaration
fs/super.c: sync ro remount after blocking writers
vfs: unexport the getname() symbol
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/compat.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/compat.h b/include/linux/compat.h index 19f6003291de..3f448c65511b 100644 --- a/include/linux/compat.h +++ b/include/linux/compat.h @@ -337,7 +337,7 @@ asmlinkage ssize_t compat_sys_preadv(compat_ulong_t fd, asmlinkage ssize_t compat_sys_pwritev(compat_ulong_t fd, const struct compat_iovec __user *vec, compat_ulong_t vlen, u32 pos_low, u32 pos_high); -asmlinkage long comat_sys_lseek(unsigned int, compat_off_t, unsigned int); +asmlinkage long compat_sys_lseek(unsigned int, compat_off_t, unsigned int); asmlinkage long compat_sys_execve(const char __user *filename, const compat_uptr_t __user *argv, const compat_uptr_t __user *envp); |