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

Commit 2dd2dfa0 authored by Jeff Layton's avatar Jeff Layton Committed by Steve French
Browse files

Rename CIFSSMBSetFileTimes to CIFSSMBSetFileInfo and add PID arg 



The new name is more clear since this is also used to set file
attributes. We'll need the pid_of_opener arg so that we can
pass in filehandles of other pids and spare ourselves an open
call.

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

fs/cifs/cifsproto.h

+3 −2
Original line number Original line Diff line number Diff line
@@ -176,8 +176,9 @@ extern int CIFSSMBSetPathInfo(const int xid, struct cifsTconInfo *tcon, 
			const char *fileName, const FILE_BASIC_INFO *data,

			const char *fileName, const FILE_BASIC_INFO *data,

			const struct nls_table *nls_codepage,

			const struct nls_table *nls_codepage,

			int remap_special_chars);

			int remap_special_chars);

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

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

			const FILE_BASIC_INFO *data, __u16 fid);

			const FILE_BASIC_INFO *data, __u16 fid,

			__u32 pid_of_opener);

#if 0

#if 0

extern int CIFSSMBSetAttrLegacy(int xid, struct cifsTconInfo *tcon,

extern int CIFSSMBSetAttrLegacy(int xid, struct cifsTconInfo *tcon,

			char *fileName, __u16 dos_attributes,

			char *fileName, __u16 dos_attributes,

fs/cifs/cifssmb.c

+4 −7
Original line number Original line Diff line number Diff line
@@ -4816,8 +4816,8 @@ CIFSSMBSetFileSize(const int xid, struct cifsTconInfo *tcon, __u64 size, 
   time and resort to the original setpathinfo level which takes the ancient

   time and resort to the original setpathinfo level which takes the ancient

   DOS time format with 2 second granularity */

   DOS time format with 2 second granularity */

int

int

CIFSSMBSetFileTimes(const int xid, struct cifsTconInfo *tcon,

CIFSSMBSetFileInfo(const int xid, struct cifsTconInfo *tcon,

		    const FILE_BASIC_INFO *data, __u16 fid)

		    const FILE_BASIC_INFO *data, __u16 fid, __u32 pid_of_opener)

{

{

	struct smb_com_transaction2_sfi_req *pSMB  = NULL;

	struct smb_com_transaction2_sfi_req *pSMB  = NULL;

	char *data_offset;

	char *data_offset;
@@ -4830,11 +4830,8 @@ CIFSSMBSetFileTimes(const int xid, struct cifsTconInfo *tcon, 
	if (rc)

	if (rc)

		return rc;

		return rc;





	/* At this point there is no need to override the current pid

	pSMB->hdr.Pid = cpu_to_le16((__u16)pid_of_opener);

	with the pid of the opener, but that could change if we someday

	pSMB->hdr.PidHigh = cpu_to_le16((__u16)(pid_of_opener >> 16));

	use an existing handle (rather than opening one on the fly) */

	/* pSMB->hdr.Pid = cpu_to_le16((__u16)pid_of_opener);

	pSMB->hdr.PidHigh = cpu_to_le16((__u16)(pid_of_opener >> 16));*/





	params = 6;

	params = 6;

	pSMB->MaxSetupCount = 0;

	pSMB->MaxSetupCount = 0;

fs/cifs/inode.c

+6 −5
Original line number Original line Diff line number Diff line
@@ -767,9 +767,10 @@ int cifs_unlink(struct inode *inode, struct dentry *direntry) 
						 cifs_sb->mnt_cifs_flags &

						 cifs_sb->mnt_cifs_flags &

						    CIFS_MOUNT_MAP_SPECIAL_CHR);

						    CIFS_MOUNT_MAP_SPECIAL_CHR);

				if (rc == 0) {

				if (rc == 0) {

					rc = CIFSSMBSetFileTimes(xid, pTcon,

					rc = CIFSSMBSetFileInfo(xid, pTcon,

								pinfo_buf,

								pinfo_buf,

								 netfid);

								netfid,

								current->tgid);

					CIFSSMBClose(xid, pTcon, netfid);

					CIFSSMBClose(xid, pTcon, netfid);

				}

				}

			}

			}
@@ -1702,8 +1703,8 @@ int cifs_setattr(struct dentry *direntry, struct iattr *attrs) 
					 cifs_sb->mnt_cifs_flags &

					 cifs_sb->mnt_cifs_flags &

						CIFS_MOUNT_MAP_SPECIAL_CHR);

						CIFS_MOUNT_MAP_SPECIAL_CHR);

			if (rc == 0) {

			if (rc == 0) {

				rc = CIFSSMBSetFileTimes(xid, pTcon, &time_buf,

				rc = CIFSSMBSetFileInfo(xid, pTcon, &time_buf,

							 netfid);

							 netfid, current->tgid);

				CIFSSMBClose(xid, pTcon, netfid);

				CIFSSMBClose(xid, pTcon, netfid);

			} else {

			} else {

			/* BB For even older servers we could convert time_buf

			/* BB For even older servers we could convert time_buf