3 files changed, 8 insertions, 8 deletions

diff --git a/fs/cifs/cifsproto.h b/fs/cifs/cifsproto.h
index e65ff984909..eb2be992608 100644
--- a/fs/cifs/cifsproto.h
+++ b/fs/cifs/cifsproto.h
@@ -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);
diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c
index f6e83a78618..daf010a2ba8 100644
--- a/fs/cifs/cifssmb.c
+++ b/fs/cifs/cifssmb.c
@@ -4882,9 +4882,9 @@ CIFSSMBSetFileTimes(const int xid, struct cifsTconInfo *tcon,
 
 
 int
-CIFSSMBSetTimes(const int xid, struct cifsTconInfo *tcon, const char *fileName,
-                const FILE_BASIC_INFO *data,
-                const struct nls_table *nls_codepage, int remap)
+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;
         TRANSACTION2_SPI_RSP *pSMBr = NULL;
diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c
index 024846719f1..9d94afe9b60 100644
--- a/fs/cifs/inode.c
+++ b/fs/cifs/inode.c
@@ -737,7 +737,7 @@ psx_del_no_retry:
                         /* 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 @@ mkdir_get_info:
                                 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