Merge branch 'work.quota-compat' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull compat quotactl cleanups from Al Viro:
 "More Christoph's compat cleanups: quotactl(2)"

* 'work.quota-compat' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  quota: simplify the quotactl compat handling
  compat: add a compat_need_64bit_alignment_fixup() helper
  compat: lift compat_s64 and compat_u64 to <asm-generic/compat.h>
This commit is contained in:
Linus Torvalds 2020-10-12 16:37:13 -07:00
commit e18afa5bfa
17 changed files with 113 additions and 159 deletions

View file

@ -910,6 +910,15 @@ static inline bool in_compat_syscall(void) { return false; }
#endif /* CONFIG_COMPAT */
/*
* Some legacy ABIs like the i386 one use less than natural alignment for 64-bit
* types, and will need special compat treatment for that. Most architectures
* don't need that special handling even for compat syscalls.
*/
#ifndef compat_need_64bit_alignment_fixup
#define compat_need_64bit_alignment_fixup() false
#endif
/*
* A pointer passed in from user mode. This should not
* be used for syscall parameters, just declare them

View file

@ -27,9 +27,6 @@ static inline bool is_quota_modification(struct inode *inode, struct iattr *ia)
(ia->ia_valid & ATTR_GID && !gid_eq(ia->ia_gid, inode->i_gid));
}
int kernel_quotactl(unsigned int cmd, const char __user *special,
qid_t id, void __user *addr);
#if defined(CONFIG_QUOTA)
#define quota_error(sb, fmt, args...) \