--- v30
+++ v32
@@ -18,10 +18,10 @@
  3 files changed, 23 insertions(+), 18 deletions(-)
 
 diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
-index 89d50a7785d8..25e592b6ffd9 100644
+index fedc4b0292d6..4b77e6a13e78 100644
 --- a/fs/nfsd/nfs4xdr.c
 +++ b/fs/nfsd/nfs4xdr.c
-@@ -2727,11 +2727,11 @@ nfsd4_encode_layout_types(struct xdr_stream *xdr, u32 layout_types)
+@@ -2713,11 +2713,11 @@ nfsd4_encode_layout_types(struct xdr_stream *xdr, u32 layout_types)
  #ifdef CONFIG_NFSD_V4_SECURITY_LABEL
  static inline __be32
  nfsd4_encode_security_label(struct xdr_stream *xdr, struct svc_rqst *rqstp,
@@ -35,7 +35,7 @@
  	if (!p)
  		return nfserr_resource;
  
-@@ -2741,13 +2741,13 @@ nfsd4_encode_security_label(struct xdr_stream *xdr, struct svc_rqst *rqstp,
+@@ -2727,13 +2727,13 @@ nfsd4_encode_security_label(struct xdr_stream *xdr, struct svc_rqst *rqstp,
  	 */
  	*p++ = cpu_to_be32(0); /* lfs */
  	*p++ = cpu_to_be32(0); /* pi */
@@ -51,7 +51,7 @@
  { return 0; }
  #endif
  
-@@ -2844,9 +2844,7 @@ nfsd4_encode_fattr(struct xdr_stream *xdr, struct svc_fh *fhp,
+@@ -2830,9 +2830,7 @@ nfsd4_encode_fattr(struct xdr_stream *xdr, struct svc_fh *fhp,
  	int err;
  	struct nfs4_acl *acl = NULL;
  #ifdef CONFIG_NFSD_V4_SECURITY_LABEL
@@ -62,7 +62,7 @@
  #endif
  	bool contextsupport = false;
  	struct nfsd4_compoundres *resp = rqstp->rq_resp;
-@@ -2904,7 +2902,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);
-@@ -3324,8 +3322,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;
  	}
-@@ -3346,10 +3343,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 7d9a45bc5bdb..a35618740b19 100644
+index 79554e5adb4c..e2939418789f 100644
 --- a/include/linux/security.h
 +++ b/include/linux/security.h
-@@ -605,7 +605,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 */
  
-@@ -1487,7 +1487,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 989103ec9533..e776f71d126c 100644
+index d56fcb794ff4..c9459c4754f3 100644
 --- a/security/security.c
 +++ b/security/security.c
-@@ -2399,9 +2399,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);