linux-next: manual merge of the vfs-brauner tree with the ksmbd tree

[Mark Brown <broonie@kernel.org>]

[-- Attachment #1: Type: text/plain, Size: 4397 bytes --]

Hi all,

Today's linux-next merge of the vfs-brauner tree got conflicts in:

  fs/smb/server/smb2pdu.c
  fs/smb/server/vfs.c
  fs/smb/server/vfs.h

between commits:

  a0115a20ecc50 ("ksmbd: fix invalid pointer dereference when get_inode_acl() fails")
  1be59204ab530 ("ksmbd: copy stream content when renaming to a new stream name")
  a90dd07b4dfb3 ("ksmbd: look up stream size by exact xattr name")

from the ksmbd tree and commits:

  16d90b57d8439 ("fs: port xattr to const mnt_idmap")
  0c18a70900eee ("fs: port i_{g,u}id_into_vfs{g,u}id() to const mnt_idmap")

from the vfs-brauner tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --cc fs/smb/server/smb2pdu.c
index 5221c6e944d55,262360e184fb3..0000000000000
--- a/fs/smb/server/smb2pdu.c
+++ b/fs/smb/server/smb2pdu.c
@@@ -3667,11 -3634,10 +3667,11 @@@ static int smb2_create_sd_buffer(struc
  			    le32_to_cpu(sd_buf->ccontext.DataLength), true, false);
  }
  
 -static void ksmbd_acls_fattr(struct smb_fattr *fattr,
 -			     const struct mnt_idmap *idmap,
 -			     struct inode *inode)
 +static int ksmbd_acls_fattr(struct smb_fattr *fattr,
- 			    struct mnt_idmap *idmap,
++			    const struct mnt_idmap *idmap,
 +			    struct inode *inode)
  {
 +	struct posix_acl *acl;
  	vfsuid_t vfsuid = i_uid_into_vfsuid(idmap, inode);
  	vfsgid_t vfsgid = i_gid_into_vfsgid(idmap, inode);
  
diff --cc fs/smb/server/vfs.c
index db0f2de2bab3a,5cb161994e702..0000000000000
--- a/fs/smb/server/vfs.c
+++ b/fs/smb/server/vfs.c
@@@ -217,9 -216,9 +217,9 @@@ int ksmbd_vfs_mkdir(struct ksmbd_work *
  	return err;
  }
  
- ssize_t ksmbd_vfs_getcasexattr(struct mnt_idmap *idmap,
 -static ssize_t ksmbd_vfs_getcasexattr(const struct mnt_idmap *idmap,
 -				      struct dentry *dentry, char *attr_name,
 -				      int attr_name_len, char **attr_value)
++ssize_t ksmbd_vfs_getcasexattr(const struct mnt_idmap *idmap,
 +			       struct dentry *dentry, char *attr_name,
 +			       int attr_name_len, char **attr_value)
  {
  	char *name, *xattr_list = NULL;
  	ssize_t value_len = -ENOENT, xattr_list_len;
@@@ -842,8 -841,8 +842,8 @@@ ssize_t ksmbd_vfs_listxattr(struct dent
  	return size;
  }
  
- ssize_t ksmbd_vfs_xattr_len(struct mnt_idmap *idmap,
 -static ssize_t ksmbd_vfs_xattr_len(const struct mnt_idmap *idmap,
 -				   struct dentry *dentry, char *xattr_name)
++ssize_t ksmbd_vfs_xattr_len(const struct mnt_idmap *idmap,
 +			    struct dentry *dentry, char *xattr_name)
  {
  	return vfs_getxattr(idmap, dentry, xattr_name, NULL, 0);
  }
@@@ -1672,10 -1671,9 +1672,10 @@@ out
  	kfree(def_smb_acl);
  	return rc;
  }
 +EXPORT_SYMBOL_IF_KUNIT(ksmbd_vfs_set_sd_xattr);
  
  int ksmbd_vfs_get_sd_xattr(struct ksmbd_conn *conn,
- 			   struct mnt_idmap *idmap,
+ 			   const struct mnt_idmap *idmap,
  			   struct dentry *dentry,
  			   struct smb_ntsd **pntsd)
  {
diff --cc fs/smb/server/vfs.h
index 566c670c90bed,67cc48e583c81..0000000000000
--- a/fs/smb/server/vfs.h
+++ b/fs/smb/server/vfs.h
@@@ -108,15 -108,10 +108,15 @@@ ssize_t ksmbd_vfs_getxattr(const struc
  			   struct dentry *dentry,
  			   char *xattr_name,
  			   char **xattr_buf);
- ssize_t ksmbd_vfs_xattr_len(struct mnt_idmap *idmap,
++ssize_t ksmbd_vfs_xattr_len(const struct mnt_idmap *idmap,
 +			    struct dentry *dentry, char *xattr_name);
- ssize_t ksmbd_vfs_getcasexattr(struct mnt_idmap *idmap,
++ssize_t ksmbd_vfs_getcasexattr(const struct mnt_idmap *idmap,
 +			       struct dentry *dentry, char *attr_name,
 +			       int attr_name_len, char **attr_value);
- ssize_t ksmbd_vfs_casexattr_len(struct mnt_idmap *idmap,
+ ssize_t ksmbd_vfs_casexattr_len(const struct mnt_idmap *idmap,
  				struct dentry *dentry, char *attr_name,
  				int attr_name_len);
- int ksmbd_vfs_setxattr(struct mnt_idmap *idmap,
+ int ksmbd_vfs_setxattr(const struct mnt_idmap *idmap,
  		       const struct path *path, const char *attr_name,
  		       void *attr_value, size_t attr_size, int flags,
  		       bool get_write);

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]