[packages/kernel/LINUX_4_1] - fix vserver patch - rel 2

[baggins]

commit 0e66e2fb8741924517c2fcc944748a7e53a46e31
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Tue Dec 27 21:39:05 2016 +0100

    - fix vserver patch
    - rel 2

 kernel-vserver-2.3.patch | 12 ++++++------
 kernel.spec              |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index a65a9d8..0729212 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -71,7 +71,7 @@
 %define		have_pcmcia	0
 %endif
 
-%define		rel		1
+%define		rel		2
 %define		basever		4.1
 %define		postver		.37
 
diff --git a/kernel-vserver-2.3.patch b/kernel-vserver-2.3.patch
index 2f9f498..25df404 100644
--- a/kernel-vserver-2.3.patch
+++ b/kernel-vserver-2.3.patch
@@ -1481,8 +1481,8 @@ diff -NurpP --minimal linux-4.1.27/fs/attr.c linux-4.1.27-vs2.3.8.5.2/fs/attr.c
 +#include <linux/vs_tag.h>
  
  /**
-  * inode_change_ok - check if attribute changes to an inode are allowed
-@@ -77,6 +80,10 @@ int inode_change_ok(const struct inode *
+  * setattr_prepare - check if attribute changes to a dentry are allowed
+@@ -77,6 +80,10 @@ int setattr_prepare(struct dentry *dentry
  			return -EPERM;
  	}
  
@@ -1490,9 +1490,9 @@ diff -NurpP --minimal linux-4.1.27/fs/attr.c linux-4.1.27-vs2.3.8.5.2/fs/attr.c
 +	if (dx_permission(inode, MAY_WRITE))
 +		return -EACCES;
 +
- 	return 0;
- }
- EXPORT_SYMBOL(inode_change_ok);
+ kill_priv:
+ 	/* User has permission for the change */
+ 	if (ia_valid & ATTR_KILL_PRIV) {
 @@ -147,6 +154,8 @@ void setattr_copy(struct inode *inode, c
  		inode->i_uid = attr->ia_uid;
  	if (ia_valid & ATTR_GID)
@@ -18557,7 +18557,7 @@ diff -NurpP --minimal linux-4.1.27/kernel/vserver/inode.c linux-4.1.27-vs2.3.8.5
 +		if (in->i_op && in->i_op->setattr)
 +			error = in->i_op->setattr(de, &attr);
 +		else {
-+			error = inode_change_ok(in, &attr);
++			error = setattr_prepare(de, &attr);
 +			if (!error) {
 +				setattr_copy(in, &attr);
 +				mark_inode_dirty(in);
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/0e66e2fb8741924517c2fcc944748a7e53a46e31