Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 01ea95e3 authored by Jeff Layton's avatar Jeff Layton Committed by Steve French
Browse files

cifs: rename CIFSSMBUnixSetInfo to CIFSSMBUnixSetPathInfo 



cifs: rename CIFSSMBUnixSetInfo to CIFSSMBUnixSetPathInfo

...in preparation of adding a SET_FILE_INFO variant.

Signed-off-by: default avatarJeff Layton <jlayton@redhat.com>
Signed-off-by: default avatarSteve French <sfrench@us.ibm.com>
parent c4c1bff6

fs/cifs/cifsproto.h

+1 −1
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ struct cifs_unix_set_info_args { 
	dev_t	device;

};



extern int CIFSSMBUnixSetInfo(const int xid, struct cifsTconInfo *pTcon,

extern int CIFSSMBUnixSetPathInfo(const int xid, struct cifsTconInfo *pTcon,

			char *fileName,

			const struct cifs_unix_set_info_args *args,

			const struct nls_table *nls_codepage,

fs/cifs/cifssmb.c

+3 −3
Original line number Diff line number Diff line
@@ -5075,7 +5075,7 @@ SetAttrLgcyRetry: 
#endif /* temporarily unneeded SetAttr legacy function */



int

CIFSSMBUnixSetInfo(const int xid, struct cifsTconInfo *tcon, char *fileName,

CIFSSMBUnixSetPathInfo(const int xid, struct cifsTconInfo *tcon, char *fileName,

		       const struct cifs_unix_set_info_args *args,

		       const struct nls_table *nls_codepage, int remap)

{

fs/cifs/dir.c

+8 −7
Original line number Diff line number Diff line
@@ -425,9 +425,10 @@ cifs_create(struct inode *inode, struct dentry *direntry, int mode, 
			args.uid = NO_CHANGE_64;

			args.gid = NO_CHANGE_64;

		}

		CIFSSMBUnixSetInfo(xid, tcon, full_path, &args,

		CIFSSMBUnixSetPathInfo(xid, tcon, full_path, &args,

					cifs_sb->local_nls,

			cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MAP_SPECIAL_CHR);

					cifs_sb->mnt_cifs_flags &

						CIFS_MOUNT_MAP_SPECIAL_CHR);

	} else {

		/* BB implement mode setting via Windows security

		   descriptors e.g. */
@@ -515,8 +516,8 @@ int cifs_mknod(struct inode *inode, struct dentry *direntry, int mode, 
			args.uid = NO_CHANGE_64;

			args.gid = NO_CHANGE_64;

		}

		rc = CIFSSMBUnixSetInfo(xid, pTcon, full_path,

			&args, cifs_sb->local_nls,

		rc = CIFSSMBUnixSetPathInfo(xid, pTcon, full_path, &args,

					    cifs_sb->local_nls,

					    cifs_sb->mnt_cifs_flags &

						CIFS_MOUNT_MAP_SPECIAL_CHR);

fs/cifs/file.c

+3 −3
Original line number Diff line number Diff line
@@ -448,7 +448,7 @@ int cifs_open(struct inode *inode, struct file *file) 
				.mtime	= NO_CHANGE_64,

				.device	= 0,

			};

			CIFSSMBUnixSetInfo(xid, tcon, full_path, &args,

			CIFSSMBUnixSetPathInfo(xid, tcon, full_path, &args,

					       cifs_sb->local_nls,

					       cifs_sb->mnt_cifs_flags &

						CIFS_MOUNT_MAP_SPECIAL_CHR);

fs/cifs/inode.c

+8 −8
Original line number Diff line number Diff line
@@ -1241,7 +1241,7 @@ mkdir_get_info: 
				args.uid = NO_CHANGE_64;

				args.gid = NO_CHANGE_64;

			}

			CIFSSMBUnixSetInfo(xid, pTcon, full_path, &args,

			CIFSSMBUnixSetPathInfo(xid, pTcon, full_path, &args,

					       cifs_sb->local_nls,

					       cifs_sb->mnt_cifs_flags &

						CIFS_MOUNT_MAP_SPECIAL_CHR);
@@ -1876,7 +1876,7 @@ cifs_setattr_unix(struct dentry *direntry, struct iattr *attrs) 
		args->ctime = NO_CHANGE_64;



	args->device = 0;

	rc = CIFSSMBUnixSetInfo(xid, pTcon, full_path, args,

	rc = CIFSSMBUnixSetPathInfo(xid, pTcon, full_path, args,

				    cifs_sb->local_nls,

				    cifs_sb->mnt_cifs_flags &

					CIFS_MOUNT_MAP_SPECIAL_CHR);