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: Jeff Layton <jlayton@redhat.com> Signed-off-by: Steve French <sfrench@us.ibm.com>
This commit is contained in:
parent
063ea27925
commit
6fc000e519
|
@ -172,7 +172,7 @@ extern int CIFSSMBQFSUnixInfo(const int xid, struct cifsTconInfo *tcon);
|
||||||
extern int CIFSSMBQFSPosixInfo(const int xid, struct cifsTconInfo *tcon,
|
extern int CIFSSMBQFSPosixInfo(const int xid, struct cifsTconInfo *tcon,
|
||||||
struct kstatfs *FSData);
|
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 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);
|
||||||
|
|
|
@ -4882,8 +4882,8 @@ CIFSSMBSetFileTimes(const int xid, struct cifsTconInfo *tcon,
|
||||||
|
|
||||||
|
|
||||||
int
|
int
|
||||||
CIFSSMBSetTimes(const int xid, struct cifsTconInfo *tcon, const char *fileName,
|
CIFSSMBSetPathInfo(const int xid, struct cifsTconInfo *tcon,
|
||||||
const FILE_BASIC_INFO *data,
|
const char *fileName, const FILE_BASIC_INFO *data,
|
||||||
const struct nls_table *nls_codepage, int remap)
|
const struct nls_table *nls_codepage, int remap)
|
||||||
{
|
{
|
||||||
TRANSACTION2_SPI_REQ *pSMB = NULL;
|
TRANSACTION2_SPI_REQ *pSMB = NULL;
|
||||||
|
|
|
@ -737,7 +737,7 @@ psx_del_no_retry:
|
||||||
/* ATTRS set to normal clears r/o bit */
|
/* ATTRS set to normal clears r/o bit */
|
||||||
pinfo_buf->Attributes = cpu_to_le32(ATTR_NORMAL);
|
pinfo_buf->Attributes = cpu_to_le32(ATTR_NORMAL);
|
||||||
if (!(pTcon->ses->flags & CIFS_SES_NT4))
|
if (!(pTcon->ses->flags & CIFS_SES_NT4))
|
||||||
rc = CIFSSMBSetTimes(xid, pTcon, full_path,
|
rc = CIFSSMBSetPathInfo(xid, pTcon, full_path,
|
||||||
pinfo_buf,
|
pinfo_buf,
|
||||||
cifs_sb->local_nls,
|
cifs_sb->local_nls,
|
||||||
cifs_sb->mnt_cifs_flags &
|
cifs_sb->mnt_cifs_flags &
|
||||||
|
@ -1010,7 +1010,7 @@ mkdir_get_info:
|
||||||
FILE_BASIC_INFO pInfo;
|
FILE_BASIC_INFO pInfo;
|
||||||
memset(&pInfo, 0, sizeof(pInfo));
|
memset(&pInfo, 0, sizeof(pInfo));
|
||||||
pInfo.Attributes = cpu_to_le32(ATTR_READONLY);
|
pInfo.Attributes = cpu_to_le32(ATTR_READONLY);
|
||||||
CIFSSMBSetTimes(xid, pTcon, full_path,
|
CIFSSMBSetPathInfo(xid, pTcon, full_path,
|
||||||
&pInfo, cifs_sb->local_nls,
|
&pInfo, cifs_sb->local_nls,
|
||||||
cifs_sb->mnt_cifs_flags &
|
cifs_sb->mnt_cifs_flags &
|
||||||
CIFS_MOUNT_MAP_SPECIAL_CHR);
|
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
|
/* In the future we should experiment - try setting timestamps
|
||||||
via Handle (SetFileInfo) instead of by path */
|
via Handle (SetFileInfo) instead of by path */
|
||||||
if (!(pTcon->ses->flags & CIFS_SES_NT4))
|
if (!(pTcon->ses->flags & CIFS_SES_NT4))
|
||||||
rc = CIFSSMBSetTimes(xid, pTcon, full_path, &time_buf,
|
rc = CIFSSMBSetPathInfo(xid, pTcon, full_path,
|
||||||
cifs_sb->local_nls,
|
&time_buf, cifs_sb->local_nls,
|
||||||
cifs_sb->mnt_cifs_flags &
|
cifs_sb->mnt_cifs_flags &
|
||||||
CIFS_MOUNT_MAP_SPECIAL_CHR);
|
CIFS_MOUNT_MAP_SPECIAL_CHR);
|
||||||
else
|
else
|
||||||
|
|
Loading…
Reference in a new issue