--- v37
+++ v32
@@ -18,7 +18,7 @@
3 files changed, 23 insertions(+), 18 deletions(-)
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
-index 512ad208d62a..3e42738df71a 100644
+index fedc4b0292d6..4b77e6a13e78 100644
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -2713,11 +2713,11 @@ nfsd4_encode_layout_types(struct xdr_stream *xdr, u32 layout_types)
@@ -62,7 +62,7 @@
#endif
bool contextsupport = false;
struct nfsd4_compoundres *resp = rqstp->rq_resp;
-@@ -2893,7 +2891,7 @@ nfsd4_encode_fattr(struct xdr_stream *xdr, struct svc_fh *fhp,
+@@ -2890,7 +2888,7 @@ nfsd4_encode_fattr(struct xdr_stream *xdr, struct svc_fh *fhp,
bmval0 & FATTR4_WORD0_SUPPORTED_ATTRS) {
if (exp->ex_flags & NFSEXP_SECURITY_LABEL)
err = security_inode_getsecctx(d_inode(dentry),
@@ -71,7 +71,7 @@
else
err = -EOPNOTSUPP;
contextsupport = (err == 0);
-@@ -3320,8 +3318,7 @@ nfsd4_encode_fattr(struct xdr_stream *xdr, struct svc_fh *fhp,
+@@ -3310,8 +3308,7 @@ nfsd4_encode_fattr(struct xdr_stream *xdr, struct svc_fh *fhp,
#ifdef CONFIG_NFSD_V4_SECURITY_LABEL
if (bmval2 & FATTR4_WORD2_SECURITY_LABEL) {
@@ -81,7 +81,7 @@
if (status)
goto out;
}
-@@ -3342,10 +3339,8 @@ nfsd4_encode_fattr(struct xdr_stream *xdr, struct svc_fh *fhp,
+@@ -3332,10 +3329,8 @@ nfsd4_encode_fattr(struct xdr_stream *xdr, struct svc_fh *fhp,
out:
#ifdef CONFIG_NFSD_V4_SECURITY_LABEL
@@ -95,10 +95,10 @@
kfree(acl);
if (tempfh) {
diff --git a/include/linux/security.h b/include/linux/security.h
-index 5afd0148a1a5..ca2ed1909608 100644
+index 79554e5adb4c..e2939418789f 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
-@@ -624,7 +624,7 @@ void security_release_secctx(struct lsmcontext *cp);
+@@ -603,7 +603,7 @@ void security_release_secctx(struct lsmcontext *cp);
void security_inode_invalidate_secctx(struct inode *inode);
int security_inode_notifysecctx(struct inode *inode, void *ctx, u32 ctxlen);
int security_inode_setsecctx(struct dentry *dentry, void *ctx, u32 ctxlen);
@@ -107,7 +107,7 @@
int security_locked_down(enum lockdown_reason what);
#else /* CONFIG_SECURITY */
-@@ -1500,7 +1500,8 @@ static inline int security_inode_setsecctx(struct dentry *dentry, void *ctx, u32
+@@ -1478,7 +1478,8 @@ static inline int security_inode_setsecctx(struct dentry *dentry, void *ctx, u32
{
return -EOPNOTSUPP;
}
@@ -118,10 +118,10 @@
return -EOPNOTSUPP;
}
diff --git a/security/security.c b/security/security.c
-index b52c7c55a092..72df3d0cd233 100644
+index d56fcb794ff4..c9459c4754f3 100644
--- a/security/security.c
+++ b/security/security.c
-@@ -2428,9 +2428,18 @@ int security_inode_setsecctx(struct dentry *dentry, void *ctx, u32 ctxlen)
+@@ -2421,9 +2421,18 @@ int security_inode_setsecctx(struct dentry *dentry, void *ctx, u32 ctxlen)
}
EXPORT_SYMBOL(security_inode_setsecctx);
@@ -143,5 +143,5 @@
EXPORT_SYMBOL(security_inode_getsecctx);
--
-2.36.1
+2.31.1