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

[Mark Brown <broonie@kernel.org>]

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

Hi all,

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

  fs/smb/server/vfs.c

between commits:

  9a4c5d1700381 ("ksmbd: look up stream size by exact xattr name")
  26a14db500b82 ("ksmbd: copy stream content when renaming to a new stream name")
  5d2b1ab54e9a8 ("ksmbd: fix named stream write and EOF handling")

from the ksmbd tree and commits:

  16d90b57d8439 ("fs: port xattr to const mnt_idmap")
  025756ee7b476 ("fs: port mnt_idmap() and file_mnt_idmap() 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/vfs.c
index 3e06095463793,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;
@@@ -387,8 -386,8 +387,8 @@@ static int ksmbd_vfs_stream_write(struc
  {
  	const struct cred *saved_cred;
  	char *stream_buf = NULL, *wbuf;
- 	struct mnt_idmap *idmap = file_mnt_idmap(fp->filp);
+ 	const struct mnt_idmap *idmap = file_mnt_idmap(fp->filp);
 -	size_t size;
 +	size_t size, write_end;
  	ssize_t v_len;
  	int err = 0;
  
@@@ -898,8 -841,8 +898,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);
  }
@@@ -1728,10 -1671,9 +1728,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)
  {

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