cifs: Rename MF symlink function names
Clean up camel case in functionnames. Signed-off-by: Sachin Prabhu <sprabhu@redhat.com> Reviewed-by: Jeff Layton <jlayton@redhat.com> Signed-off-by: Steve French <smfrench@gmail.com>
This commit is contained in:
parent
b5be1a1c4c
commit
cb084b1a9b
4 changed files with 24 additions and 26 deletions
|
@ -476,8 +476,8 @@ extern int CIFSSMBSetPosixACL(const unsigned int xid, struct cifs_tcon *tcon,
|
||||||
extern int CIFSGetExtAttr(const unsigned int xid, struct cifs_tcon *tcon,
|
extern int CIFSGetExtAttr(const unsigned int xid, struct cifs_tcon *tcon,
|
||||||
const int netfid, __u64 *pExtAttrBits, __u64 *pMask);
|
const int netfid, __u64 *pExtAttrBits, __u64 *pMask);
|
||||||
extern void cifs_autodisable_serverino(struct cifs_sb_info *cifs_sb);
|
extern void cifs_autodisable_serverino(struct cifs_sb_info *cifs_sb);
|
||||||
extern bool CIFSCouldBeMFSymlink(const struct cifs_fattr *fattr);
|
extern bool couldbe_mf_symlink(const struct cifs_fattr *fattr);
|
||||||
extern int CIFSCheckMFSymlink(unsigned int xid, struct cifs_tcon *tcon,
|
extern int check_mf_symlink(unsigned int xid, struct cifs_tcon *tcon,
|
||||||
struct cifs_sb_info *cifs_sb,
|
struct cifs_sb_info *cifs_sb,
|
||||||
struct cifs_fattr *fattr,
|
struct cifs_fattr *fattr,
|
||||||
const unsigned char *path);
|
const unsigned char *path);
|
||||||
|
|
|
@ -383,10 +383,10 @@ int cifs_get_inode_info_unix(struct inode **pinode,
|
||||||
|
|
||||||
/* check for Minshall+French symlinks */
|
/* check for Minshall+French symlinks */
|
||||||
if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MF_SYMLINKS) {
|
if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MF_SYMLINKS) {
|
||||||
int tmprc = CIFSCheckMFSymlink(xid, tcon, cifs_sb, &fattr,
|
int tmprc = check_mf_symlink(xid, tcon, cifs_sb, &fattr,
|
||||||
full_path);
|
full_path);
|
||||||
if (tmprc)
|
if (tmprc)
|
||||||
cifs_dbg(FYI, "CIFSCheckMFSymlink: %d\n", tmprc);
|
cifs_dbg(FYI, "check_mf_symlink: %d\n", tmprc);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (*pinode == NULL) {
|
if (*pinode == NULL) {
|
||||||
|
@ -800,10 +800,10 @@ cifs_get_inode_info(struct inode **inode, const char *full_path,
|
||||||
|
|
||||||
/* check for Minshall+French symlinks */
|
/* check for Minshall+French symlinks */
|
||||||
if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MF_SYMLINKS) {
|
if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MF_SYMLINKS) {
|
||||||
tmprc = CIFSCheckMFSymlink(xid, tcon, cifs_sb, &fattr,
|
tmprc = check_mf_symlink(xid, tcon, cifs_sb, &fattr,
|
||||||
full_path);
|
full_path);
|
||||||
if (tmprc)
|
if (tmprc)
|
||||||
cifs_dbg(FYI, "CIFSCheckMFSymlink: %d\n", tmprc);
|
cifs_dbg(FYI, "check_mf_symlink: %d\n", tmprc);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!*inode) {
|
if (!*inode) {
|
||||||
|
|
|
@ -91,10 +91,8 @@ symlink_hash_err:
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
CIFSParseMFSymlink(const u8 *buf,
|
parse_mf_symlink(const u8 *buf, unsigned int buf_len, unsigned int *_link_len,
|
||||||
unsigned int buf_len,
|
char **_link_str)
|
||||||
unsigned int *_link_len,
|
|
||||||
char **_link_str)
|
|
||||||
{
|
{
|
||||||
int rc;
|
int rc;
|
||||||
unsigned int link_len;
|
unsigned int link_len;
|
||||||
|
@ -137,7 +135,7 @@ CIFSParseMFSymlink(const u8 *buf,
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
CIFSFormatMFSymlink(u8 *buf, unsigned int buf_len, const char *link_str)
|
format_mf_symlink(u8 *buf, unsigned int buf_len, const char *link_str)
|
||||||
{
|
{
|
||||||
int rc;
|
int rc;
|
||||||
unsigned int link_len;
|
unsigned int link_len;
|
||||||
|
@ -181,7 +179,7 @@ CIFSFormatMFSymlink(u8 *buf, unsigned int buf_len, const char *link_str)
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
CIFSCreateMFSymLink(const unsigned int xid, struct cifs_tcon *tcon,
|
create_mf_symlink(const unsigned int xid, struct cifs_tcon *tcon,
|
||||||
const char *fromName, const char *toName,
|
const char *fromName, const char *toName,
|
||||||
struct cifs_sb_info *cifs_sb)
|
struct cifs_sb_info *cifs_sb)
|
||||||
{
|
{
|
||||||
|
@ -202,7 +200,7 @@ CIFSCreateMFSymLink(const unsigned int xid, struct cifs_tcon *tcon,
|
||||||
if (!buf)
|
if (!buf)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
||||||
rc = CIFSFormatMFSymlink(buf, CIFS_MF_SYMLINK_FILE_SIZE, toName);
|
rc = format_mf_symlink(buf, CIFS_MF_SYMLINK_FILE_SIZE, toName);
|
||||||
if (rc != 0) {
|
if (rc != 0) {
|
||||||
kfree(buf);
|
kfree(buf);
|
||||||
return rc;
|
return rc;
|
||||||
|
@ -238,7 +236,7 @@ CIFSCreateMFSymLink(const unsigned int xid, struct cifs_tcon *tcon,
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
CIFSQueryMFSymLink(const unsigned int xid, struct cifs_tcon *tcon,
|
query_mf_symlink(const unsigned int xid, struct cifs_tcon *tcon,
|
||||||
const unsigned char *searchName, char **symlinkinfo,
|
const unsigned char *searchName, char **symlinkinfo,
|
||||||
const struct nls_table *nls_codepage, int remap)
|
const struct nls_table *nls_codepage, int remap)
|
||||||
{
|
{
|
||||||
|
@ -282,7 +280,7 @@ CIFSQueryMFSymLink(const unsigned int xid, struct cifs_tcon *tcon,
|
||||||
return rc;
|
return rc;
|
||||||
}
|
}
|
||||||
|
|
||||||
rc = CIFSParseMFSymlink(buf, bytes_read, &link_len, symlinkinfo);
|
rc = parse_mf_symlink(buf, bytes_read, &link_len, symlinkinfo);
|
||||||
kfree(buf);
|
kfree(buf);
|
||||||
if (rc != 0)
|
if (rc != 0)
|
||||||
return rc;
|
return rc;
|
||||||
|
@ -291,7 +289,7 @@ CIFSQueryMFSymLink(const unsigned int xid, struct cifs_tcon *tcon,
|
||||||
}
|
}
|
||||||
|
|
||||||
bool
|
bool
|
||||||
CIFSCouldBeMFSymlink(const struct cifs_fattr *fattr)
|
couldbe_mf_symlink(const struct cifs_fattr *fattr)
|
||||||
{
|
{
|
||||||
if (!(fattr->cf_mode & S_IFREG))
|
if (!(fattr->cf_mode & S_IFREG))
|
||||||
/* it's not a symlink */
|
/* it's not a symlink */
|
||||||
|
@ -341,16 +339,16 @@ out:
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
CIFSCheckMFSymlink(unsigned int xid, struct cifs_tcon *tcon,
|
check_mf_symlink(unsigned int xid, struct cifs_tcon *tcon,
|
||||||
struct cifs_sb_info *cifs_sb, struct cifs_fattr *fattr,
|
struct cifs_sb_info *cifs_sb, struct cifs_fattr *fattr,
|
||||||
const unsigned char *path)
|
const unsigned char *path)
|
||||||
{
|
{
|
||||||
int rc;
|
int rc;
|
||||||
u8 *buf = NULL;
|
u8 *buf = NULL;
|
||||||
unsigned int link_len = 0;
|
unsigned int link_len = 0;
|
||||||
unsigned int bytes_read = 0;
|
unsigned int bytes_read = 0;
|
||||||
|
|
||||||
if (!CIFSCouldBeMFSymlink(fattr))
|
if (!couldbe_mf_symlink(fattr))
|
||||||
/* it's not a symlink */
|
/* it's not a symlink */
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
|
@ -370,7 +368,7 @@ CIFSCheckMFSymlink(unsigned int xid, struct cifs_tcon *tcon,
|
||||||
if (bytes_read == 0) /* not a symlink */
|
if (bytes_read == 0) /* not a symlink */
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
rc = CIFSParseMFSymlink(buf, bytes_read, &link_len, NULL);
|
rc = parse_mf_symlink(buf, bytes_read, &link_len, NULL);
|
||||||
if (rc == -EINVAL) {
|
if (rc == -EINVAL) {
|
||||||
/* it's not a symlink */
|
/* it's not a symlink */
|
||||||
rc = 0;
|
rc = 0;
|
||||||
|
@ -519,7 +517,7 @@ cifs_follow_link(struct dentry *direntry, struct nameidata *nd)
|
||||||
* and fallback to UNIX Extensions Symlinks.
|
* and fallback to UNIX Extensions Symlinks.
|
||||||
*/
|
*/
|
||||||
if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MF_SYMLINKS)
|
if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MF_SYMLINKS)
|
||||||
rc = CIFSQueryMFSymLink(xid, tcon, full_path, &target_path,
|
rc = query_mf_symlink(xid, tcon, full_path, &target_path,
|
||||||
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);
|
||||||
|
@ -576,7 +574,7 @@ cifs_symlink(struct inode *inode, struct dentry *direntry, const char *symname)
|
||||||
|
|
||||||
/* BB what if DFS and this volume is on different share? BB */
|
/* BB what if DFS and this volume is on different share? BB */
|
||||||
if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MF_SYMLINKS)
|
if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MF_SYMLINKS)
|
||||||
rc = CIFSCreateMFSymLink(xid, pTcon, full_path, symname,
|
rc = create_mf_symlink(xid, pTcon, full_path, symname,
|
||||||
cifs_sb);
|
cifs_sb);
|
||||||
else if (pTcon->unix_ext)
|
else if (pTcon->unix_ext)
|
||||||
rc = CIFSUnixCreateSymLink(xid, pTcon, full_path, symname,
|
rc = CIFSUnixCreateSymLink(xid, pTcon, full_path, symname,
|
||||||
|
|
|
@ -749,7 +749,7 @@ static int cifs_filldir(char *find_entry, struct file *file,
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MF_SYMLINKS) &&
|
if ((cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MF_SYMLINKS) &&
|
||||||
CIFSCouldBeMFSymlink(&fattr))
|
couldbe_mf_symlink(&fattr))
|
||||||
/*
|
/*
|
||||||
* trying to get the type and mode can be slow,
|
* trying to get the type and mode can be slow,
|
||||||
* so just call those regular files for now, and mark
|
* so just call those regular files for now, and mark
|
||||||
|
|
Loading…
Add table
Reference in a new issue