aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Layton <jlayton@redhat.com>2008-08-02 07:26:12 -0400
committerSteve French <sfrench@us.ibm.com>2008-08-06 00:24:01 -0400
commit6fc000e5190234c7e5b244d1e2095d50b630d63f (patch)
treee572820b5565e75f55391ea6e8d3d17c65b63f35
parent063ea27925d70b1d9dd4343d685f722f0274bfd1 (diff)
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>
-rw-r--r--fs/cifs/cifsproto.h2
-rw-r--r--fs/cifs/cifssmb.c6
-rw-r--r--fs/cifs/inode.c8
3 files changed, 8 insertions, 8 deletions
diff --git a/fs/cifs/cifsproto.h b/fs/cifs/cifsproto.h
index e65ff9849092..eb2be992608d 100644
--- a/fs/cifs/cifsproto.h
+++ b/fs/cifs/cifsproto.h
@@ -172,7 +172,7 @@ extern int CIFSSMBQFSUnixInfo(const int xid, struct cifsTconInfo *tcon);
172extern int CIFSSMBQFSPosixInfo(const int xid, struct cifsTconInfo *tcon, 172extern int CIFSSMBQFSPosixInfo(const int xid, struct cifsTconInfo *tcon,
173 struct kstatfs *FSData); 173 struct kstatfs *FSData);
174 174
175extern int CIFSSMBSetTimes(const int xid, struct cifsTconInfo *tcon, 175extern int CIFSSMBSetPathInfo(const int xid, struct cifsTconInfo *tcon,
176 const char *fileName, const FILE_BASIC_INFO *data, 176 const char *fileName, const FILE_BASIC_INFO *data,
177 const struct nls_table *nls_codepage, 177 const struct nls_table *nls_codepage,
178 int remap_special_chars); 178 int remap_special_chars);
diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c
index f6e83a78618e..daf010a2ba80 100644
--- a/fs/cifs/cifssmb.c
+++ b/fs/cifs/cifssmb.c
@@ -4882,9 +4882,9 @@ CIFSSMBSetFileTimes(const int xid, struct cifsTconInfo *tcon,
4882 4882
4883 4883
4884int 4884int
4885CIFSSMBSetTimes(const int xid, struct cifsTconInfo *tcon, const char *fileName, 4885CIFSSMBSetPathInfo(const int xid, struct cifsTconInfo *tcon,
4886 const FILE_BASIC_INFO *data, 4886 const char *fileName, const FILE_BASIC_INFO *data,
4887 const struct nls_table *nls_codepage, int remap) 4887 const struct nls_table *nls_codepage, int remap)
4888{ 4888{
4889 TRANSACTION2_SPI_REQ *pSMB = NULL; 4889 TRANSACTION2_SPI_REQ *pSMB = NULL;
4890 TRANSACTION2_SPI_RSP *pSMBr = NULL; 4890 TRANSACTION2_SPI_RSP *pSMBr = NULL;
diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c
index 024846719f1f..9d94afe9b60e 100644
--- a/fs/cifs/inode.c
+++ b/fs/cifs/inode.c
@@ -737,7 +737,7 @@ psx_del_no_retry:
737 /* ATTRS set to normal clears r/o bit */ 737 /* ATTRS set to normal clears r/o bit */
738 pinfo_buf->Attributes = cpu_to_le32(ATTR_NORMAL); 738 pinfo_buf->Attributes = cpu_to_le32(ATTR_NORMAL);
739 if (!(pTcon->ses->flags & CIFS_SES_NT4)) 739 if (!(pTcon->ses->flags & CIFS_SES_NT4))
740 rc = CIFSSMBSetTimes(xid, pTcon, full_path, 740 rc = CIFSSMBSetPathInfo(xid, pTcon, full_path,
741 pinfo_buf, 741 pinfo_buf,
742 cifs_sb->local_nls, 742 cifs_sb->local_nls,
743 cifs_sb->mnt_cifs_flags & 743 cifs_sb->mnt_cifs_flags &
@@ -1010,7 +1010,7 @@ mkdir_get_info:
1010 FILE_BASIC_INFO pInfo; 1010 FILE_BASIC_INFO pInfo;
1011 memset(&pInfo, 0, sizeof(pInfo)); 1011 memset(&pInfo, 0, sizeof(pInfo));
1012 pInfo.Attributes = cpu_to_le32(ATTR_READONLY); 1012 pInfo.Attributes = cpu_to_le32(ATTR_READONLY);
1013 CIFSSMBSetTimes(xid, pTcon, full_path, 1013 CIFSSMBSetPathInfo(xid, pTcon, full_path,
1014 &pInfo, cifs_sb->local_nls, 1014 &pInfo, cifs_sb->local_nls,
1015 cifs_sb->mnt_cifs_flags & 1015 cifs_sb->mnt_cifs_flags &
1016 CIFS_MOUNT_MAP_SPECIAL_CHR); 1016 CIFS_MOUNT_MAP_SPECIAL_CHR);
@@ -1680,8 +1680,8 @@ int cifs_setattr(struct dentry *direntry, struct iattr *attrs)
1680 /* In the future we should experiment - try setting timestamps 1680 /* In the future we should experiment - try setting timestamps
1681 via Handle (SetFileInfo) instead of by path */ 1681 via Handle (SetFileInfo) instead of by path */
1682 if (!(pTcon->ses->flags & CIFS_SES_NT4)) 1682 if (!(pTcon->ses->flags & CIFS_SES_NT4))
1683 rc = CIFSSMBSetTimes(xid, pTcon, full_path, &time_buf, 1683 rc = CIFSSMBSetPathInfo(xid, pTcon, full_path,
1684 cifs_sb->local_nls, 1684 &time_buf, cifs_sb->local_nls,
1685 cifs_sb->mnt_cifs_flags & 1685 cifs_sb->mnt_cifs_flags &
1686 CIFS_MOUNT_MAP_SPECIAL_CHR); 1686 CIFS_MOUNT_MAP_SPECIAL_CHR);
1687 else 1687 else