Fix two broken backports

2 files changed, 11 insertions, 12 deletions

diff --git a/patches/btrfs-don-t-accept-bare-namespace-as-a-valid-xattr.patch b/patches/btrfs-don-t-accept-bare-namespace-as-a-valid-xattr.patch
index 18c5dda..eeeaf94 100644
--- a/patches/btrfs-don-t-accept-bare-namespace-as-a-valid-xattr.patch
+++ b/patches/btrfs-don-t-accept-bare-namespace-as-a-valid-xattr.patch
@@ -23,12 +23,12 @@ Signed-off-by: Chris Mason <clm@fb.com>
  - 3.4 doesn't support XATTR_BTRFS_PREFIX]
 Signed-off-by: Zefan Li <lizefan@huawei.com>
 ---
- fs/btrfs/xattr.c |   51 +++++++++++++++++++++++++++++++++++++--------------
- 1 file changed, 37 insertions(+), 14 deletions(-)
+ fs/btrfs/xattr.c |   50 +++++++++++++++++++++++++++++++++++++-------------
+ 1 file changed, 37 insertions(+), 13 deletions(-)
 
 --- a/fs/btrfs/xattr.c
 +++ b/fs/btrfs/xattr.c
-@@ -310,22 +310,40 @@ const struct xattr_handler *btrfs_xattr_
+@@ -310,21 +310,40 @@ const struct xattr_handler *btrfs_xattr_
  /*
   * Check if the attribute is in a supported namespace.
   *
@@ -43,8 +43,7 @@ Signed-off-by: Zefan Li <lizefan@huawei.com>
 -			XATTR_SECURITY_PREFIX_LEN) ||
 -	       !strncmp(name, XATTR_SYSTEM_PREFIX, XATTR_SYSTEM_PREFIX_LEN) ||
 -	       !strncmp(name, XATTR_TRUSTED_PREFIX, XATTR_TRUSTED_PREFIX_LEN) ||
--	       !strncmp(name, XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN) ||
--		!strncmp(name, XATTR_BTRFS_PREFIX, XATTR_BTRFS_PREFIX_LEN);
+-	       !strncmp(name, XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN);
 +	int len = strlen(name);
 +	int prefixlen = 0;
 +
@@ -77,7 +76,7 @@ Signed-off-by: Zefan Li <lizefan@huawei.com>
  	/*
  	 * If this is a request for a synthetic attribute in the system.*
  	 * namespace use the generic infrastructure to resolve a handler
-@@ -334,8 +352,9 @@ ssize_t btrfs_getxattr(struct dentry *de
+@@ -333,8 +352,9 @@ ssize_t btrfs_getxattr(struct dentry *de
  	if (!strncmp(name, XATTR_SYSTEM_PREFIX, XATTR_SYSTEM_PREFIX_LEN))
  		return generic_getxattr(dentry, name, buffer, size);
  
@@ -89,7 +88,7 @@ Signed-off-by: Zefan Li <lizefan@huawei.com>
  	return __btrfs_getxattr(dentry->d_inode, name, buffer, size);
  }
  
-@@ -343,6 +362,7 @@ int btrfs_setxattr(struct dentry *dentry
+@@ -342,6 +362,7 @@ int btrfs_setxattr(struct dentry *dentry
  		   size_t size, int flags)
  {
  	struct btrfs_root *root = BTRFS_I(dentry->d_inode)->root;
@@ -97,7 +96,7 @@ Signed-off-by: Zefan Li <lizefan@huawei.com>
  
  	/*
  	 * The permission on security.* and system.* is not checked
-@@ -359,8 +379,9 @@ int btrfs_setxattr(struct dentry *dentry
+@@ -358,8 +379,9 @@ int btrfs_setxattr(struct dentry *dentry
  	if (!strncmp(name, XATTR_SYSTEM_PREFIX, XATTR_SYSTEM_PREFIX_LEN))
  		return generic_setxattr(dentry, name, value, size, flags);
  
@@ -109,7 +108,7 @@ Signed-off-by: Zefan Li <lizefan@huawei.com>
  
  	if (size == 0)
  		value = "";  /* empty EA, do not remove */
-@@ -372,6 +393,7 @@ int btrfs_setxattr(struct dentry *dentry
+@@ -371,6 +393,7 @@ int btrfs_setxattr(struct dentry *dentry
  int btrfs_removexattr(struct dentry *dentry, const char *name)
  {
  	struct btrfs_root *root = BTRFS_I(dentry->d_inode)->root;
@@ -117,7 +116,7 @@ Signed-off-by: Zefan Li <lizefan@huawei.com>
  
  	/*
  	 * The permission on security.* and system.* is not checked
-@@ -388,8 +410,9 @@ int btrfs_removexattr(struct dentry *den
+@@ -387,8 +410,9 @@ int btrfs_removexattr(struct dentry *den
  	if (!strncmp(name, XATTR_SYSTEM_PREFIX, XATTR_SYSTEM_PREFIX_LEN))
  		return generic_removexattr(dentry, name);
  
diff --git a/patches/rdma-cma-canonize-ipv4-on-ipv6-sockets-properly.patch b/patches/rdma-cma-canonize-ipv4-on-ipv6-sockets-properly.patch
index 54e9b6c..87731bf 100644
--- a/patches/rdma-cma-canonize-ipv4-on-ipv6-sockets-properly.patch
+++ b/patches/rdma-cma-canonize-ipv4-on-ipv6-sockets-properly.patch
@@ -57,7 +57,7 @@ Signed-off-by: Zefan Li <lizefan@huawei.com>
 +		ip4->sin_family = AF_INET;;
  		ip4->sin_addr.s_addr = dst->ip4.addr;
 -		ip4->sin_port = listen4->sin_port;
-+		ip4->sin_port = ss_get_port(&listen_id->route.addr.src_addr);
++		ip4->sin_port = ss_get_port(&listen_addr->src_addr);
  
  		ip4 = (struct sockaddr_in *) &addr->dst_addr;
 -		ip4->sin_family = listen4->sin_family;
@@ -72,7 +72,7 @@ Signed-off-by: Zefan Li <lizefan@huawei.com>
 +		ip6->sin6_family = AF_INET6;
  		ip6->sin6_addr = dst->ip6;
 -		ip6->sin6_port = listen6->sin6_port;
-+		ip6->sin6_port = ss_get_port(&listen_id->route.addr.src_addr);
++		ip6->sin6_port = ss_get_port(&listen_addr->src_addr);
  
  		ip6 = (struct sockaddr_in6 *) &addr->dst_addr;
 -		ip6->sin6_family = listen6->sin6_family;