@@ -1,7 +1,7 @@

 Summary:	Linux API header files

 Name:		linux-api-headers

 Version:	4.4.82

-Release:	1%{?dist}

+Release:	2%{?dist}

 License:	GPLv2

 URL:		http://www.kernel.org/

 Group:		System Environment/Kernel

@@ -10,10 +10,14 @@ Distribution: Photon

 Source0:    	http://www.kernel.org/pub/linux/kernel/v4.x/linux-%{version}.tar.xz

 %define sha1 linux=27a2c7d466ec5b93712a9e17fa564652a0c06142

 BuildArch:	noarch

+# From SPECS/linux and used by linux-esx only

+# It provides f*xattrat syscalls

+Patch0:       Implement-the-f-xattrat-family-of-functions.patch

 %description

 The Linux API Headers expose the kernel's API for use by Glibc.

 %prep

 %setup -q -n linux-%{version}

+%patch0 -p1

 %build

 make mrproper

 make headers_check

@@ -25,6 +29,8 @@ find /%{buildroot}%{_includedir} \( -name .install -o -name ..install.cmd \) -de

 %defattr(-,root,root)

 %{_includedir}/*

 %changelog

+*   Wed Aug 16 2017 Alexey Makhalov <amakhalov@vmware.com> 4.4.82-2

+-   Implement the f*xattrat family of syscalls

 *   Tue Aug 15 2017 Alexey Makhalov <amakhalov@vmware.com> 4.4.82-1

 -   Version update

 *   Fri Aug 11 2017 Alexey Makhalov <amakhalov@vmware.com> 4.4.81-1

new file mode 100644

@@ -0,0 +1,236 @@

+From dd6595e90768ea30a0a41d96ceb5da3cc1916bd2 Mon Sep 17 00:00:00 2001

+From: Alexey Makhalov <amakhalov@vmware.com>

+Date: Wed, 16 Aug 2017 21:14:17 +0000

+Subject: [PATCH] Implement the f*xattrat family of functions

+

+Inspired by https://lkml.org/lkml/2014/1/21/266

+---

+ arch/x86/entry/syscalls/syscall_32.tbl |   4 ++

+ arch/x86/entry/syscalls/syscall_64.tbl |   4 ++

+ fs/xattr.c                             | 123 +++++++++++++++++++++++++++++++++

+ include/linux/syscalls.h               |  11 ++-

+ 4 files changed, 141 insertions(+), 1 deletion(-)

+

+diff --git a/arch/x86/entry/syscalls/syscall_32.tbl b/arch/x86/entry/syscalls/syscall_32.tbl

+index e62f440..11d05f9 100644

+--- a/arch/x86/entry/syscalls/syscall_32.tbl

+@@ -383,3 +383,7 @@

+ 374	i386	userfaultfd		sys_userfaultfd

+ 375	i386	membarrier		sys_membarrier

+ 376	i386	mlock2			sys_mlock2

++377	i386	fsetxattrat		sys_fsetxattrat

++378	i386	fgetxattrat		sys_fgetxattrat

++379	i386	flistxattrat		sys_flistxattrat

++380	i386	fremovexattrat		sys_fremovexattrat

+diff --git a/arch/x86/entry/syscalls/syscall_64.tbl b/arch/x86/entry/syscalls/syscall_64.tbl

+index 314a90b..3c2dfa1 100644

+--- a/arch/x86/entry/syscalls/syscall_64.tbl

+@@ -332,6 +332,10 @@

+ 323	common	userfaultfd		sys_userfaultfd

+ 324	common	membarrier		sys_membarrier

+ 325	common	mlock2			sys_mlock2

++326	common	fsetxattrat		sys_fsetxattrat

++327	common	fgetxattrat		sys_fgetxattrat

++328	common	flistxattrat		sys_flistxattrat

++329	common	fremovexattrat		sys_fremovexattrat

+ 

+ #

+ # x32-specific system call numbers start at 512 to avoid cache impact

+diff --git a/fs/xattr.c b/fs/xattr.c

+index f0da9d2..d5e4944 100644

+--- a/fs/xattr.c

+@@ -419,6 +419,41 @@ SYSCALL_DEFINE5(fsetxattr, int, fd, const char __user *, name,

+ 	return error;

+ }

+ 

++SYSCALL_DEFINE6(fsetxattrat, int, fd, const char __user *, pathname,

++		const char __user *, name, const void __user *, value,

++		size_t, size, int, flags)

++{

++	struct path path;

++	int error;

++	unsigned int lookup_flags = 0;

++

++	if (flags & ~(XATTR_CREATE | XATTR_REPLACE |

++		      AT_SYMLINK_NOFOLLOW | AT_EMPTY_PATH))

++		return -EINVAL;

++

++	if (!(flags & AT_SYMLINK_NOFOLLOW))

++		lookup_flags |= LOOKUP_FOLLOW;

++	if (flags & AT_EMPTY_PATH)

++		lookup_flags |= LOOKUP_EMPTY;

++

++retry:

++	error = user_path_at(fd, pathname, lookup_flags, &path);

++	if (error)

++		return error;

++	error = mnt_want_write(path.mnt);

++	if (!error) {

++		error = setxattr(path.dentry, name, value, size,

++				 flags & (XATTR_CREATE | XATTR_REPLACE));

++		mnt_drop_write(path.mnt);

++	}

++	path_put(&path);

++	if (retry_estale(error, lookup_flags)) {

++		lookup_flags |= LOOKUP_REVAL;

++		goto retry;

++	}

++	return error;

++}

++

+ /*

+  * Extended attribute GET operations

+  */

+@@ -513,6 +548,35 @@ SYSCALL_DEFINE4(fgetxattr, int, fd, const char __user *, name,

+ 	return error;

+ }

+ 

++SYSCALL_DEFINE6(fgetxattrat, int, fd, const char __user *, pathname,

++		const char __user *, name, void __user *, value, size_t, size,

++		int, flags)

++{

++	struct path path;

++	ssize_t error;

++	unsigned int lookup_flags = 0;

++

++	if (flags & ~(AT_SYMLINK_NOFOLLOW | AT_EMPTY_PATH))

++		return -EINVAL;

++

++	if (!(flags & AT_SYMLINK_NOFOLLOW))

++		lookup_flags |= LOOKUP_FOLLOW;

++	if (flags & AT_EMPTY_PATH)

++		lookup_flags |= LOOKUP_EMPTY;

++

++retry:

++	error = user_path_at(fd, pathname, lookup_flags, &path);

++	if (error)

++		return error;

++	error = getxattr(path.dentry, name, value, size);

++	path_put(&path);

++	if (retry_estale(error, lookup_flags)) {

++		lookup_flags |= LOOKUP_REVAL;

++		goto retry;

++	}

++	return error;

++}

++

+ /*

+  * Extended attribute LIST operations

+  */

+@@ -594,6 +658,34 @@ SYSCALL_DEFINE3(flistxattr, int, fd, char __user *, list, size_t, size)

+ 	return error;

+ }

+ 

++SYSCALL_DEFINE5(flistxattrat, int, fd, const char __user *, pathname,

++		char __user *, list, size_t, size, int, flags)

++{

++	struct path path;

++	ssize_t error;

++	unsigned int lookup_flags = 0;

++

++	if (flags & ~(AT_SYMLINK_NOFOLLOW | AT_EMPTY_PATH))

++		return -EINVAL;

++

++	if (!(flags & AT_SYMLINK_NOFOLLOW))

++		lookup_flags |= LOOKUP_FOLLOW;

++	if (flags & AT_EMPTY_PATH)

++		lookup_flags |= LOOKUP_EMPTY;

++

++retry:

++	error = user_path_at(fd, pathname, lookup_flags, &path);

++	if (error)

++		return error;

++	error = listxattr(path.dentry, list, size);

++	path_put(&path);

++	if (retry_estale(error, lookup_flags)) {

++		lookup_flags |= LOOKUP_REVAL;

++		goto retry;

++	}

++	return error;

++}

++

+ /*

+  * Extended attribute REMOVE operations

+  */

+@@ -663,6 +755,37 @@ SYSCALL_DEFINE2(fremovexattr, int, fd, const char __user *, name)

+ 	return error;

+ }

+ 

++SYSCALL_DEFINE4(fremovexattrat, int, fd, const char __user *, pathname,

++		const char __user *, name, int, flags)

++{

++	struct path path;

++	int error;

++	unsigned int lookup_flags = 0;

++

++	if (flags & ~(AT_SYMLINK_NOFOLLOW | AT_EMPTY_PATH))

++		return -EINVAL;

++

++	if (!(flags & AT_SYMLINK_NOFOLLOW))

++		lookup_flags |= LOOKUP_FOLLOW;

++	if (flags & AT_EMPTY_PATH)

++		lookup_flags |= LOOKUP_EMPTY;

++

++retry:

++	error = user_path_at(fd, pathname, lookup_flags, &path);

++	if (error)

++		return error;

++	error = mnt_want_write(path.mnt);

++	if (!error) {

++		error = removexattr(path.dentry, name);

++		mnt_drop_write(path.mnt);

++	}

++	path_put(&path);

++	if (retry_estale(error, lookup_flags)) {

++		lookup_flags |= LOOKUP_REVAL;

++		goto retry;

++	}

++	return error;

++}

+ 

+ static const char *

+ strcmp_prefix(const char *a, const char *a_prefix)

+diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h

+index c2b66a2..daf1856 100644

+--- a/include/linux/syscalls.h

+@@ -430,23 +430,32 @@ asmlinkage long sys_lsetxattr(const char __user *path, const char __user *name,

+ 			      const void __user *value, size_t size, int flags);

+ asmlinkage long sys_fsetxattr(int fd, const char __user *name,

+ 			      const void __user *value, size_t size, int flags);

++asmlinkage long sys_fsetxattrat(int fd, const char __user *pathname,

++				const char __user *name,

++				const void __user *value, size_t size, int flags);

+ asmlinkage long sys_getxattr(const char __user *path, const char __user *name,

+ 			     void __user *value, size_t size);

+ asmlinkage long sys_lgetxattr(const char __user *path, const char __user *name,

+ 			      void __user *value, size_t size);

+ asmlinkage long sys_fgetxattr(int fd, const char __user *name,

+ 			      void __user *value, size_t size);

++asmlinkage long sys_fgetxattrat(int fd, const char __user *pathname,

++				const char __user *name,

++				void __user *value, size_t size, int flags);

+ asmlinkage long sys_listxattr(const char __user *path, char __user *list,

+ 			      size_t size);

+ asmlinkage long sys_llistxattr(const char __user *path, char __user *list,

+ 			       size_t size);

+ asmlinkage long sys_flistxattr(int fd, char __user *list, size_t size);

++asmlinkage long sys_flistxattrat(int fd, const char __user *pathname,

++				 char __user *list, size_t size, int flags);

+ asmlinkage long sys_removexattr(const char __user *path,

+ 				const char __user *name);

+ asmlinkage long sys_lremovexattr(const char __user *path,

+ 				 const char __user *name);

+ asmlinkage long sys_fremovexattr(int fd, const char __user *name);

+-

++asmlinkage long sys_fremovexattrat(int fd, const char __user *pathname,

++				   const char __user *name, int flags);

+ asmlinkage long sys_brk(unsigned long brk);

+ asmlinkage long sys_mprotect(unsigned long start, size_t len,

+ 				unsigned long prot);

+-- 

+2.8.1

+

@@ -2,7 +2,7 @@

 Summary:       Kernel

 Name:          linux-esx

 Version:       4.4.82

-Release:       1%{?dist}

+Release:       2%{?dist}

 License:       GPLv2

 URL:           http://www.kernel.org/

 Group:         System Environment/Kernel

@@ -35,6 +35,7 @@ Patch20:       vmci-1.1.4.0-use-32bit-atomics-for-queue-headers.patch

 Patch21:       vmci-1.1.5.0-doorbell-create-and-destroy-fixes.patch

 Patch22:       net-9p-vsock.patch

 Patch23:       p9fs_dir_readdir-offset-support.patch

+Patch24:       Implement-the-f-xattrat-family-of-functions.patch

 BuildRequires: bc

 BuildRequires: kbd

@@ -95,6 +96,7 @@ The Linux package contains the Linux kernel doc files

 %patch21 -p1

 %patch22 -p1

 %patch23 -p1

+%patch24 -p1

 %build

 # patch vmw_balloon driver

@@ -183,6 +185,8 @@ ln -sf linux-%{uname_r}.cfg /boot/photon.cfg

 /usr/src/linux-headers-%{uname_r}

 %changelog

+*   Wed Aug 16 2017 Alexey Makhalov <amakhalov@vmware.com> 4.4.82-2

+-   Implement the f*xattrat family of syscalls

 *   Tue Aug 15 2017 Alexey Makhalov <amakhalov@vmware.com> 4.4.82-1

 -   Version update

 *   Fri Aug 11 2017 Alexey Makhalov <amakhalov@vmware.com> 4.4.81-1