aboutsummaryrefslogtreecommitdiffstats
path: root/fs/cifs
diff options
context:
space:
mode:
authorJeff Layton <jlayton@redhat.com>2009-07-09 20:02:49 -0400
committerSteve French <sfrench@us.ibm.com>2009-07-09 17:15:02 -0400
commit01ea95e3b6b16573a491ef98ad63f7a1bdcb504f (patch)
treea060a54d4a3fc1b08534569e2afb8d7c8d5fff37 /fs/cifs
parentc4c1bff64dfff4e6dd0936a0340f56b9284512c8 (diff)
cifs: rename CIFSSMBUnixSetInfo to CIFSSMBUnixSetPathInfo
cifs: rename CIFSSMBUnixSetInfo to CIFSSMBUnixSetPathInfo ...in preparation of adding a SET_FILE_INFO variant. Signed-off-by: Jeff Layton <jlayton@redhat.com> Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs')
-rw-r--r--fs/cifs/cifsproto.h2
-rw-r--r--fs/cifs/cifssmb.c6
-rw-r--r--fs/cifs/dir.c15
-rw-r--r--fs/cifs/file.c6
-rw-r--r--fs/cifs/inode.c16
5 files changed, 23 insertions, 22 deletions
diff --git a/fs/cifs/cifsproto.h b/fs/cifs/cifsproto.h
index b2bd83fd2aa4..d95fd427de57 100644
--- a/fs/cifs/cifsproto.h
+++ b/fs/cifs/cifsproto.h
@@ -220,7 +220,7 @@ struct cifs_unix_set_info_args {
220 dev_t device; 220 dev_t device;
221}; 221};
222 222
223extern int CIFSSMBUnixSetInfo(const int xid, struct cifsTconInfo *pTcon, 223extern int CIFSSMBUnixSetPathInfo(const int xid, struct cifsTconInfo *pTcon,
224 char *fileName, 224 char *fileName,
225 const struct cifs_unix_set_info_args *args, 225 const struct cifs_unix_set_info_args *args,
226 const struct nls_table *nls_codepage, 226 const struct nls_table *nls_codepage,
diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c
index 61007c627497..1cd01ba03656 100644
--- a/fs/cifs/cifssmb.c
+++ b/fs/cifs/cifssmb.c
@@ -5075,9 +5075,9 @@ SetAttrLgcyRetry:
5075#endif /* temporarily unneeded SetAttr legacy function */ 5075#endif /* temporarily unneeded SetAttr legacy function */
5076 5076
5077int 5077int
5078CIFSSMBUnixSetInfo(const int xid, struct cifsTconInfo *tcon, char *fileName, 5078CIFSSMBUnixSetPathInfo(const int xid, struct cifsTconInfo *tcon, char *fileName,
5079 const struct cifs_unix_set_info_args *args, 5079 const struct cifs_unix_set_info_args *args,
5080 const struct nls_table *nls_codepage, int remap) 5080 const struct nls_table *nls_codepage, int remap)
5081{ 5081{
5082 TRANSACTION2_SPI_REQ *pSMB = NULL; 5082 TRANSACTION2_SPI_REQ *pSMB = NULL;
5083 TRANSACTION2_SPI_RSP *pSMBr = NULL; 5083 TRANSACTION2_SPI_RSP *pSMBr = NULL;
diff --git a/fs/cifs/dir.c b/fs/cifs/dir.c
index ff55fc6932cb..4326ffd90fa9 100644
--- a/fs/cifs/dir.c
+++ b/fs/cifs/dir.c
@@ -425,9 +425,10 @@ cifs_create(struct inode *inode, struct dentry *direntry, int mode,
425 args.uid = NO_CHANGE_64; 425 args.uid = NO_CHANGE_64;
426 args.gid = NO_CHANGE_64; 426 args.gid = NO_CHANGE_64;
427 } 427 }
428 CIFSSMBUnixSetInfo(xid, tcon, full_path, &args, 428 CIFSSMBUnixSetPathInfo(xid, tcon, full_path, &args,
429 cifs_sb->local_nls, 429 cifs_sb->local_nls,
430 cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MAP_SPECIAL_CHR); 430 cifs_sb->mnt_cifs_flags &
431 CIFS_MOUNT_MAP_SPECIAL_CHR);
431 } else { 432 } else {
432 /* BB implement mode setting via Windows security 433 /* BB implement mode setting via Windows security
433 descriptors e.g. */ 434 descriptors e.g. */
@@ -515,10 +516,10 @@ int cifs_mknod(struct inode *inode, struct dentry *direntry, int mode,
515 args.uid = NO_CHANGE_64; 516 args.uid = NO_CHANGE_64;
516 args.gid = NO_CHANGE_64; 517 args.gid = NO_CHANGE_64;
517 } 518 }
518 rc = CIFSSMBUnixSetInfo(xid, pTcon, full_path, 519 rc = CIFSSMBUnixSetPathInfo(xid, pTcon, full_path, &args,
519 &args, cifs_sb->local_nls, 520 cifs_sb->local_nls,
520 cifs_sb->mnt_cifs_flags & 521 cifs_sb->mnt_cifs_flags &
521 CIFS_MOUNT_MAP_SPECIAL_CHR); 522 CIFS_MOUNT_MAP_SPECIAL_CHR);
522 523
523 if (!rc) { 524 if (!rc) {
524 rc = cifs_get_inode_info_unix(&newinode, full_path, 525 rc = cifs_get_inode_info_unix(&newinode, full_path,
diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index 97ce4bf89d15..c34b7f8a217b 100644
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -448,9 +448,9 @@ int cifs_open(struct inode *inode, struct file *file)
448 .mtime = NO_CHANGE_64, 448 .mtime = NO_CHANGE_64,
449 .device = 0, 449 .device = 0,
450 }; 450 };
451 CIFSSMBUnixSetInfo(xid, tcon, full_path, &args, 451 CIFSSMBUnixSetPathInfo(xid, tcon, full_path, &args,
452 cifs_sb->local_nls, 452 cifs_sb->local_nls,
453 cifs_sb->mnt_cifs_flags & 453 cifs_sb->mnt_cifs_flags &
454 CIFS_MOUNT_MAP_SPECIAL_CHR); 454 CIFS_MOUNT_MAP_SPECIAL_CHR);
455 } 455 }
456 } 456 }
diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c
index b22379610d71..ad19007ea05f 100644
--- a/fs/cifs/inode.c
+++ b/fs/cifs/inode.c
@@ -1241,10 +1241,10 @@ mkdir_get_info:
1241 args.uid = NO_CHANGE_64; 1241 args.uid = NO_CHANGE_64;
1242 args.gid = NO_CHANGE_64; 1242 args.gid = NO_CHANGE_64;
1243 } 1243 }
1244 CIFSSMBUnixSetInfo(xid, pTcon, full_path, &args, 1244 CIFSSMBUnixSetPathInfo(xid, pTcon, full_path, &args,
1245 cifs_sb->local_nls, 1245 cifs_sb->local_nls,
1246 cifs_sb->mnt_cifs_flags & 1246 cifs_sb->mnt_cifs_flags &
1247 CIFS_MOUNT_MAP_SPECIAL_CHR); 1247 CIFS_MOUNT_MAP_SPECIAL_CHR);
1248 } else { 1248 } else {
1249 if (!(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_CIFS_ACL) && 1249 if (!(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_CIFS_ACL) &&
1250 (mode & S_IWUGO) == 0) { 1250 (mode & S_IWUGO) == 0) {
@@ -1876,10 +1876,10 @@ cifs_setattr_unix(struct dentry *direntry, struct iattr *attrs)
1876 args->ctime = NO_CHANGE_64; 1876 args->ctime = NO_CHANGE_64;
1877 1877
1878 args->device = 0; 1878 args->device = 0;
1879 rc = CIFSSMBUnixSetInfo(xid, pTcon, full_path, args, 1879 rc = CIFSSMBUnixSetPathInfo(xid, pTcon, full_path, args,
1880 cifs_sb->local_nls, 1880 cifs_sb->local_nls,
1881 cifs_sb->mnt_cifs_flags & 1881 cifs_sb->mnt_cifs_flags &
1882 CIFS_MOUNT_MAP_SPECIAL_CHR); 1882 CIFS_MOUNT_MAP_SPECIAL_CHR);
1883 1883
1884 if (!rc) 1884 if (!rc)
1885 rc = inode_setattr(inode, attrs); 1885 rc = inode_setattr(inode, attrs);