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

Commit c60afe10 authored by Riku Voipio's avatar Riku Voipio Committed by Russell King
Browse files

[ARM] 4878/1: Add oabi shim for fstatat64 

Ccoreutils and other have started using fstatat64. Thus, we
need a shim for it if we want to support modern oldabi
userlands (such as Debian/arm/lenny) with EABI kernels.

See http://bugs.debian.org/462677



Acked-by: default avatarNicolas Pitre <nico@cam.org>
Signed-off-by: default avatarRiku Voipio <riku.voipio@movial.fi>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 3085354d

arch/arm/kernel/calls.S

+1 −1
Original line number Diff line number Diff line
@@ -336,7 +336,7 @@ 
		CALL(sys_mknodat)

/* 325 */	CALL(sys_fchownat)

		CALL(sys_futimesat)

		CALL(sys_fstatat64)

		CALL(ABI(sys_fstatat64,  sys_oabi_fstatat64))

		CALL(sys_unlinkat)

		CALL(sys_renameat)

/* 330 */	CALL(sys_linkat)

arch/arm/kernel/sys_oabi-compat.c

+24 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
 * sys_stat64:

 * sys_lstat64:

 * sys_fstat64:

 * sys_fstatat64:

 *

 *   struct stat64 has different sizes and some members are shifted

 *   Compatibility wrappers are needed for them and provided below.
@@ -169,6 +170,29 @@ asmlinkage long sys_oabi_fstat64(unsigned long fd, 
	return error;

}



asmlinkage long sys_oabi_fstatat64(int dfd,

				   char __user *filename,

				   struct oldabi_stat64  __user *statbuf,

				   int flag)

{

	struct kstat stat;

	int error = -EINVAL;



	if ((flag & ~AT_SYMLINK_NOFOLLOW) != 0)

		goto out;



	if (flag & AT_SYMLINK_NOFOLLOW)

		error = vfs_lstat_fd(dfd, filename, &stat);

	else

		error = vfs_stat_fd(dfd, filename, &stat);



	if (!error)

	error = cp_oldabi_stat64(&stat, statbuf);



out:

	return error;

}



struct oabi_flock64 {

	short	l_type;

	short	l_whence;