Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 1 Feb 2014 18:43:45 +0000 (10:43 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 1 Feb 2014 18:43:45 +0000 (10:43 -0800)
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

1  2 
include/linux/compat.h

diff --combined include/linux/compat.h
@@@ -337,7 -337,7 +337,7 @@@ asmlinkage ssize_t compat_sys_preadv(co
  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);
@@@ -422,7 -422,7 +422,7 @@@ extern long compat_arch_ptrace(struct t
  asmlinkage long compat_sys_ptrace(compat_long_t request, compat_long_t pid,
                                  compat_long_t addr, compat_long_t data);
  
 -asmlinkage long compat_sys_lookup_dcookie(u32, u32, char __user *, size_t);
 +asmlinkage long compat_sys_lookup_dcookie(u32, u32, char __user *, compat_size_t);
  /*
   * epoll (fs/eventpoll.c) compat bits follow ...
   */