Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 54e45c16 authored by Catalin Marinas's avatar Catalin Marinas
Browse files

syscalls: Declare sys_*stat64 prototypes if __ARCH_WANT_(COMPAT_)STAT64 



Currently, the sys_stat64, sys_fstat64 and sys_lstat64 prototpyes are
only declared if BITS_PER_LONG == 32. Following commit 0753f70f
(fs: Build sys_stat64() and friends if __ARCH_WANT_COMPAT_STAT64), the
implementation of these functions is allowed on 64-bit systems for
compat support. The patch changes the condition on the prototype
declaration from BITS_PER_LONG == 32 to defined(__ARCH_WANT_STAT64) ||
defined(__ARCH_WANT_COMPAT_STAT64).

In addition, it moves the sys_fstatat64 prototype under the same #if
block

Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Acked-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Cc: Arnd Bergmann <arnd@arndb.de>
parent e9fb8b7e

include/linux/syscalls.h

+5 −3
Original line number Diff line number Diff line
@@ -410,12 +410,16 @@ asmlinkage long sys_newlstat(const char __user *filename, 
				struct stat __user *statbuf);

asmlinkage long sys_newfstat(unsigned int fd, struct stat __user *statbuf);

asmlinkage long sys_ustat(unsigned dev, struct ustat __user *ubuf);

#if BITS_PER_LONG == 32

#if defined(__ARCH_WANT_STAT64) || defined(__ARCH_WANT_COMPAT_STAT64)

asmlinkage long sys_stat64(const char __user *filename,

				struct stat64 __user *statbuf);

asmlinkage long sys_fstat64(unsigned long fd, struct stat64 __user *statbuf);

asmlinkage long sys_lstat64(const char __user *filename,

				struct stat64 __user *statbuf);

asmlinkage long sys_fstatat64(int dfd, const char __user *filename,

			       struct stat64 __user *statbuf, int flag);

#endif

#if BITS_PER_LONG == 32

asmlinkage long sys_truncate64(const char __user *path, loff_t length);

asmlinkage long sys_ftruncate64(unsigned int fd, loff_t length);

#endif
@@ -771,8 +775,6 @@ asmlinkage long sys_openat(int dfd, const char __user *filename, int flags, 
			   umode_t mode);

asmlinkage long sys_newfstatat(int dfd, const char __user *filename,

			       struct stat __user *statbuf, int flag);

asmlinkage long sys_fstatat64(int dfd, const char __user *filename,

			       struct stat64 __user *statbuf, int flag);

asmlinkage long sys_readlinkat(int dfd, const char __user *path, char __user *buf,

			       int bufsiz);

asmlinkage long sys_utimensat(int dfd, const char __user *filename,