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

Commit 6fc000e5 authored by Jeff Layton's avatar Jeff Layton Committed by Steve French
Browse files

change CIFSSMBSetTimes to CIFSSMBSetPathInfo 



CIFSSMBSetTimes is a deceptive name. This function does more that just
set file times. Change it to CIFSSMBSetPathInfo, which is closer to its
real purpose.

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

fs/cifs/cifsproto.h

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ extern int CIFSSMBQFSUnixInfo(const int xid, struct cifsTconInfo *tcon); 
extern int CIFSSMBQFSPosixInfo(const int xid, struct cifsTconInfo *tcon,

			struct kstatfs *FSData);



extern int CIFSSMBSetTimes(const int xid, struct cifsTconInfo *tcon,

extern int CIFSSMBSetPathInfo(const int xid, struct cifsTconInfo *tcon,

			const char *fileName, const FILE_BASIC_INFO *data,

			const struct nls_table *nls_codepage,

			int remap_special_chars);

fs/cifs/cifssmb.c

+3 −3
Original line number Diff line number Diff line
@@ -4882,8 +4882,8 @@ CIFSSMBSetFileTimes(const int xid, struct cifsTconInfo *tcon, 




int

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

		const FILE_BASIC_INFO *data,

CIFSSMBSetPathInfo(const int xid, struct cifsTconInfo *tcon,

		   const char *fileName, const FILE_BASIC_INFO *data,

		   const struct nls_table *nls_codepage, int remap)

{

	TRANSACTION2_SPI_REQ *pSMB = NULL;

fs/cifs/inode.c

+4 −4
Original line number Diff line number Diff line
@@ -737,7 +737,7 @@ int cifs_unlink(struct inode *inode, struct dentry *direntry) 
			/* ATTRS set to normal clears r/o bit */

			pinfo_buf->Attributes = cpu_to_le32(ATTR_NORMAL);

			if (!(pTcon->ses->flags & CIFS_SES_NT4))

				rc = CIFSSMBSetTimes(xid, pTcon, full_path,

				rc = CIFSSMBSetPathInfo(xid, pTcon, full_path,

						     pinfo_buf,

						     cifs_sb->local_nls,

						     cifs_sb->mnt_cifs_flags &
@@ -1010,7 +1010,7 @@ int cifs_mkdir(struct inode *inode, struct dentry *direntry, int mode) 
				FILE_BASIC_INFO pInfo;

				memset(&pInfo, 0, sizeof(pInfo));

				pInfo.Attributes = cpu_to_le32(ATTR_READONLY);

				CIFSSMBSetTimes(xid, pTcon, full_path,

				CIFSSMBSetPathInfo(xid, pTcon, full_path,

						&pInfo, cifs_sb->local_nls,

						cifs_sb->mnt_cifs_flags &

						CIFS_MOUNT_MAP_SPECIAL_CHR);
@@ -1680,8 +1680,8 @@ int cifs_setattr(struct dentry *direntry, struct iattr *attrs) 
		/* In the future we should experiment - try setting timestamps

		   via Handle (SetFileInfo) instead of by path */

		if (!(pTcon->ses->flags & CIFS_SES_NT4))

			rc = CIFSSMBSetTimes(xid, pTcon, full_path, &time_buf,

					     cifs_sb->local_nls,

			rc = CIFSSMBSetPathInfo(xid, pTcon, full_path,

					     &time_buf, cifs_sb->local_nls,

					     cifs_sb->mnt_cifs_flags &

						CIFS_MOUNT_MAP_SPECIAL_CHR);

		else