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>
This commit is contained in:
parent
c4c1bff64d
commit
01ea95e3b6
5 changed files with 23 additions and 22 deletions
|
@ -220,7 +220,7 @@ struct cifs_unix_set_info_args {
|
||||||
dev_t device;
|
dev_t device;
|
||||||
};
|
};
|
||||||
|
|
||||||
extern int CIFSSMBUnixSetInfo(const int xid, struct cifsTconInfo *pTcon,
|
extern int CIFSSMBUnixSetPathInfo(const int xid, struct cifsTconInfo *pTcon,
|
||||||
char *fileName,
|
char *fileName,
|
||||||
const struct cifs_unix_set_info_args *args,
|
const struct cifs_unix_set_info_args *args,
|
||||||
const struct nls_table *nls_codepage,
|
const struct nls_table *nls_codepage,
|
||||||
|
|
|
@ -5075,9 +5075,9 @@ CIFSSMBSetAttrLegacy(int xid, struct cifsTconInfo *tcon, char *fileName,
|
||||||
#endif /* temporarily unneeded SetAttr legacy function */
|
#endif /* temporarily unneeded SetAttr legacy function */
|
||||||
|
|
||||||
int
|
int
|
||||||
CIFSSMBUnixSetInfo(const int xid, struct cifsTconInfo *tcon, char *fileName,
|
CIFSSMBUnixSetPathInfo(const int xid, struct cifsTconInfo *tcon, char *fileName,
|
||||||
const struct cifs_unix_set_info_args *args,
|
const struct cifs_unix_set_info_args *args,
|
||||||
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;
|
||||||
TRANSACTION2_SPI_RSP *pSMBr = NULL;
|
TRANSACTION2_SPI_RSP *pSMBr = NULL;
|
||||||
|
|
|
@ -425,9 +425,10 @@ cifs_create(struct inode *inode, struct dentry *direntry, int mode,
|
||||||
args.uid = NO_CHANGE_64;
|
args.uid = NO_CHANGE_64;
|
||||||
args.gid = NO_CHANGE_64;
|
args.gid = NO_CHANGE_64;
|
||||||
}
|
}
|
||||||
CIFSSMBUnixSetInfo(xid, tcon, full_path, &args,
|
CIFSSMBUnixSetPathInfo(xid, tcon, full_path, &args,
|
||||||
cifs_sb->local_nls,
|
cifs_sb->local_nls,
|
||||||
cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MAP_SPECIAL_CHR);
|
cifs_sb->mnt_cifs_flags &
|
||||||
|
CIFS_MOUNT_MAP_SPECIAL_CHR);
|
||||||
} else {
|
} else {
|
||||||
/* BB implement mode setting via Windows security
|
/* BB implement mode setting via Windows security
|
||||||
descriptors e.g. */
|
descriptors e.g. */
|
||||||
|
@ -515,10 +516,10 @@ int cifs_mknod(struct inode *inode, struct dentry *direntry, int mode,
|
||||||
args.uid = NO_CHANGE_64;
|
args.uid = NO_CHANGE_64;
|
||||||
args.gid = NO_CHANGE_64;
|
args.gid = NO_CHANGE_64;
|
||||||
}
|
}
|
||||||
rc = CIFSSMBUnixSetInfo(xid, pTcon, full_path,
|
rc = CIFSSMBUnixSetPathInfo(xid, pTcon, full_path, &args,
|
||||||
&args, cifs_sb->local_nls,
|
cifs_sb->local_nls,
|
||||||
cifs_sb->mnt_cifs_flags &
|
cifs_sb->mnt_cifs_flags &
|
||||||
CIFS_MOUNT_MAP_SPECIAL_CHR);
|
CIFS_MOUNT_MAP_SPECIAL_CHR);
|
||||||
|
|
||||||
if (!rc) {
|
if (!rc) {
|
||||||
rc = cifs_get_inode_info_unix(&newinode, full_path,
|
rc = cifs_get_inode_info_unix(&newinode, full_path,
|
||||||
|
|
|
@ -448,9 +448,9 @@ int cifs_open(struct inode *inode, struct file *file)
|
||||||
.mtime = NO_CHANGE_64,
|
.mtime = NO_CHANGE_64,
|
||||||
.device = 0,
|
.device = 0,
|
||||||
};
|
};
|
||||||
CIFSSMBUnixSetInfo(xid, tcon, full_path, &args,
|
CIFSSMBUnixSetPathInfo(xid, tcon, full_path, &args,
|
||||||
cifs_sb->local_nls,
|
cifs_sb->local_nls,
|
||||||
cifs_sb->mnt_cifs_flags &
|
cifs_sb->mnt_cifs_flags &
|
||||||
CIFS_MOUNT_MAP_SPECIAL_CHR);
|
CIFS_MOUNT_MAP_SPECIAL_CHR);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1241,10 +1241,10 @@ int cifs_mkdir(struct inode *inode, struct dentry *direntry, int mode)
|
||||||
args.uid = NO_CHANGE_64;
|
args.uid = NO_CHANGE_64;
|
||||||
args.gid = NO_CHANGE_64;
|
args.gid = NO_CHANGE_64;
|
||||||
}
|
}
|
||||||
CIFSSMBUnixSetInfo(xid, pTcon, full_path, &args,
|
CIFSSMBUnixSetPathInfo(xid, pTcon, full_path, &args,
|
||||||
cifs_sb->local_nls,
|
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 {
|
||||||
if (!(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_CIFS_ACL) &&
|
if (!(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_CIFS_ACL) &&
|
||||||
(mode & S_IWUGO) == 0) {
|
(mode & S_IWUGO) == 0) {
|
||||||
|
@ -1876,10 +1876,10 @@ cifs_setattr_unix(struct dentry *direntry, struct iattr *attrs)
|
||||||
args->ctime = NO_CHANGE_64;
|
args->ctime = NO_CHANGE_64;
|
||||||
|
|
||||||
args->device = 0;
|
args->device = 0;
|
||||||
rc = CIFSSMBUnixSetInfo(xid, pTcon, full_path, args,
|
rc = CIFSSMBUnixSetPathInfo(xid, pTcon, full_path, args,
|
||||||
cifs_sb->local_nls,
|
cifs_sb->local_nls,
|
||||||
cifs_sb->mnt_cifs_flags &
|
cifs_sb->mnt_cifs_flags &
|
||||||
CIFS_MOUNT_MAP_SPECIAL_CHR);
|
CIFS_MOUNT_MAP_SPECIAL_CHR);
|
||||||
|
|
||||||
if (!rc)
|
if (!rc)
|
||||||
rc = inode_setattr(inode, attrs);
|
rc = inode_setattr(inode, attrs);
|
||||||
|
|
Loading…
Reference in a new issue