aboutsummaryrefslogtreecommitdiffstats
path: root/fs/cifs/inode.c
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2011-05-27 00:34:02 -0400
committerSteve French <sfrench@us.ibm.com>2011-05-27 00:34:02 -0400
commit96daf2b09178d8ebde2b0d56b027de917c17dfdf (patch)
tree74802fa44e87925e49067d5106eb762cc27b9b97 /fs/cifs/inode.c
parent07cc6cf9ef84bcf6a60ee513332bcb0ad5d628d8 (diff)
[CIFS] Rename three structures to avoid camel case
secMode to sec_mode and cifsTconInfo to cifs_tcon and cifsSesInfo to cifs_ses Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs/inode.c')
-rw-r--r--fs/cifs/inode.c40
1 files changed, 20 insertions, 20 deletions
diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c
index e2d9dd817ba0..9b018c8334fa 100644
--- a/fs/cifs/inode.c
+++ b/fs/cifs/inode.c
@@ -295,7 +295,7 @@ int cifs_get_file_info_unix(struct file *filp)
295 struct inode *inode = filp->f_path.dentry->d_inode; 295 struct inode *inode = filp->f_path.dentry->d_inode;
296 struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb); 296 struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb);
297 struct cifsFileInfo *cfile = filp->private_data; 297 struct cifsFileInfo *cfile = filp->private_data;
298 struct cifsTconInfo *tcon = tlink_tcon(cfile->tlink); 298 struct cifs_tcon *tcon = tlink_tcon(cfile->tlink);
299 299
300 xid = GetXid(); 300 xid = GetXid();
301 rc = CIFSSMBUnixQFileInfo(xid, tcon, cfile->netfid, &find_data); 301 rc = CIFSSMBUnixQFileInfo(xid, tcon, cfile->netfid, &find_data);
@@ -318,7 +318,7 @@ int cifs_get_inode_info_unix(struct inode **pinode,
318 int rc; 318 int rc;
319 FILE_UNIX_BASIC_INFO find_data; 319 FILE_UNIX_BASIC_INFO find_data;
320 struct cifs_fattr fattr; 320 struct cifs_fattr fattr;
321 struct cifsTconInfo *tcon; 321 struct cifs_tcon *tcon;
322 struct tcon_link *tlink; 322 struct tcon_link *tlink;
323 struct cifs_sb_info *cifs_sb = CIFS_SB(sb); 323 struct cifs_sb_info *cifs_sb = CIFS_SB(sb);
324 324
@@ -373,7 +373,7 @@ cifs_sfu_type(struct cifs_fattr *fattr, const unsigned char *path,
373 int oplock = 0; 373 int oplock = 0;
374 __u16 netfid; 374 __u16 netfid;
375 struct tcon_link *tlink; 375 struct tcon_link *tlink;
376 struct cifsTconInfo *tcon; 376 struct cifs_tcon *tcon;
377 struct cifs_io_parms io_parms; 377 struct cifs_io_parms io_parms;
378 char buf[24]; 378 char buf[24];
379 unsigned int bytes_read; 379 unsigned int bytes_read;
@@ -473,7 +473,7 @@ static int cifs_sfu_mode(struct cifs_fattr *fattr, const unsigned char *path,
473 char ea_value[4]; 473 char ea_value[4];
474 __u32 mode; 474 __u32 mode;
475 struct tcon_link *tlink; 475 struct tcon_link *tlink;
476 struct cifsTconInfo *tcon; 476 struct cifs_tcon *tcon;
477 477
478 tlink = cifs_sb_tlink(cifs_sb); 478 tlink = cifs_sb_tlink(cifs_sb);
479 if (IS_ERR(tlink)) 479 if (IS_ERR(tlink))
@@ -507,7 +507,7 @@ static void
507cifs_all_info_to_fattr(struct cifs_fattr *fattr, FILE_ALL_INFO *info, 507cifs_all_info_to_fattr(struct cifs_fattr *fattr, FILE_ALL_INFO *info,
508 struct cifs_sb_info *cifs_sb, bool adjust_tz) 508 struct cifs_sb_info *cifs_sb, bool adjust_tz)
509{ 509{
510 struct cifsTconInfo *tcon = cifs_sb_master_tcon(cifs_sb); 510 struct cifs_tcon *tcon = cifs_sb_master_tcon(cifs_sb);
511 511
512 memset(fattr, 0, sizeof(*fattr)); 512 memset(fattr, 0, sizeof(*fattr));
513 fattr->cf_cifsattrs = le32_to_cpu(info->Attributes); 513 fattr->cf_cifsattrs = le32_to_cpu(info->Attributes);
@@ -558,7 +558,7 @@ int cifs_get_file_info(struct file *filp)
558 struct inode *inode = filp->f_path.dentry->d_inode; 558 struct inode *inode = filp->f_path.dentry->d_inode;
559 struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb); 559 struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb);
560 struct cifsFileInfo *cfile = filp->private_data; 560 struct cifsFileInfo *cfile = filp->private_data;
561 struct cifsTconInfo *tcon = tlink_tcon(cfile->tlink); 561 struct cifs_tcon *tcon = tlink_tcon(cfile->tlink);
562 562
563 xid = GetXid(); 563 xid = GetXid();
564 rc = CIFSSMBQFileInfo(xid, tcon, cfile->netfid, &find_data); 564 rc = CIFSSMBQFileInfo(xid, tcon, cfile->netfid, &find_data);
@@ -595,7 +595,7 @@ int cifs_get_inode_info(struct inode **pinode,
595 struct super_block *sb, int xid, const __u16 *pfid) 595 struct super_block *sb, int xid, const __u16 *pfid)
596{ 596{
597 int rc = 0, tmprc; 597 int rc = 0, tmprc;
598 struct cifsTconInfo *pTcon; 598 struct cifs_tcon *pTcon;
599 struct tcon_link *tlink; 599 struct tcon_link *tlink;
600 struct cifs_sb_info *cifs_sb = CIFS_SB(sb); 600 struct cifs_sb_info *cifs_sb = CIFS_SB(sb);
601 char *buf = NULL; 601 char *buf = NULL;
@@ -741,7 +741,7 @@ static const struct inode_operations cifs_ipc_inode_ops = {
741}; 741};
742 742
743char *cifs_build_path_to_root(struct smb_vol *vol, struct cifs_sb_info *cifs_sb, 743char *cifs_build_path_to_root(struct smb_vol *vol, struct cifs_sb_info *cifs_sb,
744 struct cifsTconInfo *tcon) 744 struct cifs_tcon *tcon)
745{ 745{
746 int pplen = vol->prepath ? strlen(vol->prepath) : 0; 746 int pplen = vol->prepath ? strlen(vol->prepath) : 0;
747 int dfsplen; 747 int dfsplen;
@@ -889,7 +889,7 @@ struct inode *cifs_root_iget(struct super_block *sb)
889 struct cifs_sb_info *cifs_sb = CIFS_SB(sb); 889 struct cifs_sb_info *cifs_sb = CIFS_SB(sb);
890 struct inode *inode = NULL; 890 struct inode *inode = NULL;
891 long rc; 891 long rc;
892 struct cifsTconInfo *tcon = cifs_sb_master_tcon(cifs_sb); 892 struct cifs_tcon *tcon = cifs_sb_master_tcon(cifs_sb);
893 893
894 xid = GetXid(); 894 xid = GetXid();
895 if (tcon->unix_ext) 895 if (tcon->unix_ext)
@@ -941,7 +941,7 @@ cifs_set_file_info(struct inode *inode, struct iattr *attrs, int xid,
941 struct cifsInodeInfo *cifsInode = CIFS_I(inode); 941 struct cifsInodeInfo *cifsInode = CIFS_I(inode);
942 struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb); 942 struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb);
943 struct tcon_link *tlink = NULL; 943 struct tcon_link *tlink = NULL;
944 struct cifsTconInfo *pTcon; 944 struct cifs_tcon *pTcon;
945 FILE_BASIC_INFO info_buf; 945 FILE_BASIC_INFO info_buf;
946 946
947 if (attrs == NULL) 947 if (attrs == NULL)
@@ -1059,7 +1059,7 @@ cifs_rename_pending_delete(char *full_path, struct dentry *dentry, int xid)
1059 struct cifsInodeInfo *cifsInode = CIFS_I(inode); 1059 struct cifsInodeInfo *cifsInode = CIFS_I(inode);
1060 struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb); 1060 struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb);
1061 struct tcon_link *tlink; 1061 struct tcon_link *tlink;
1062 struct cifsTconInfo *tcon; 1062 struct cifs_tcon *tcon;
1063 __u32 dosattr, origattr; 1063 __u32 dosattr, origattr;
1064 FILE_BASIC_INFO *info_buf = NULL; 1064 FILE_BASIC_INFO *info_buf = NULL;
1065 1065
@@ -1177,7 +1177,7 @@ int cifs_unlink(struct inode *dir, struct dentry *dentry)
1177 struct super_block *sb = dir->i_sb; 1177 struct super_block *sb = dir->i_sb;
1178 struct cifs_sb_info *cifs_sb = CIFS_SB(sb); 1178 struct cifs_sb_info *cifs_sb = CIFS_SB(sb);
1179 struct tcon_link *tlink; 1179 struct tcon_link *tlink;
1180 struct cifsTconInfo *tcon; 1180 struct cifs_tcon *tcon;
1181 struct iattr *attrs = NULL; 1181 struct iattr *attrs = NULL;
1182 __u32 dosattr = 0, origattr = 0; 1182 __u32 dosattr = 0, origattr = 0;
1183 1183
@@ -1275,7 +1275,7 @@ int cifs_mkdir(struct inode *inode, struct dentry *direntry, int mode)
1275 int xid; 1275 int xid;
1276 struct cifs_sb_info *cifs_sb; 1276 struct cifs_sb_info *cifs_sb;
1277 struct tcon_link *tlink; 1277 struct tcon_link *tlink;
1278 struct cifsTconInfo *pTcon; 1278 struct cifs_tcon *pTcon;
1279 char *full_path = NULL; 1279 char *full_path = NULL;
1280 struct inode *newinode = NULL; 1280 struct inode *newinode = NULL;
1281 struct cifs_fattr fattr; 1281 struct cifs_fattr fattr;
@@ -1453,7 +1453,7 @@ int cifs_rmdir(struct inode *inode, struct dentry *direntry)
1453 int xid; 1453 int xid;
1454 struct cifs_sb_info *cifs_sb; 1454 struct cifs_sb_info *cifs_sb;
1455 struct tcon_link *tlink; 1455 struct tcon_link *tlink;
1456 struct cifsTconInfo *pTcon; 1456 struct cifs_tcon *pTcon;
1457 char *full_path = NULL; 1457 char *full_path = NULL;
1458 struct cifsInodeInfo *cifsInode; 1458 struct cifsInodeInfo *cifsInode;
1459 1459
@@ -1510,7 +1510,7 @@ cifs_do_rename(int xid, struct dentry *from_dentry, const char *fromPath,
1510{ 1510{
1511 struct cifs_sb_info *cifs_sb = CIFS_SB(from_dentry->d_sb); 1511 struct cifs_sb_info *cifs_sb = CIFS_SB(from_dentry->d_sb);
1512 struct tcon_link *tlink; 1512 struct tcon_link *tlink;
1513 struct cifsTconInfo *pTcon; 1513 struct cifs_tcon *pTcon;
1514 __u16 srcfid; 1514 __u16 srcfid;
1515 int oplock, rc; 1515 int oplock, rc;
1516 1516
@@ -1562,7 +1562,7 @@ int cifs_rename(struct inode *source_dir, struct dentry *source_dentry,
1562 char *toName = NULL; 1562 char *toName = NULL;
1563 struct cifs_sb_info *cifs_sb; 1563 struct cifs_sb_info *cifs_sb;
1564 struct tcon_link *tlink; 1564 struct tcon_link *tlink;
1565 struct cifsTconInfo *tcon; 1565 struct cifs_tcon *tcon;
1566 FILE_UNIX_BASIC_INFO *info_buf_source = NULL; 1566 FILE_UNIX_BASIC_INFO *info_buf_source = NULL;
1567 FILE_UNIX_BASIC_INFO *info_buf_target; 1567 FILE_UNIX_BASIC_INFO *info_buf_target;
1568 int xid, rc, tmprc; 1568 int xid, rc, tmprc;
@@ -1792,7 +1792,7 @@ int cifs_getattr(struct vfsmount *mnt, struct dentry *dentry,
1792 struct kstat *stat) 1792 struct kstat *stat)
1793{ 1793{
1794 struct cifs_sb_info *cifs_sb = CIFS_SB(dentry->d_sb); 1794 struct cifs_sb_info *cifs_sb = CIFS_SB(dentry->d_sb);
1795 struct cifsTconInfo *tcon = cifs_sb_master_tcon(cifs_sb); 1795 struct cifs_tcon *tcon = cifs_sb_master_tcon(cifs_sb);
1796 struct inode *inode = dentry->d_inode; 1796 struct inode *inode = dentry->d_inode;
1797 int rc; 1797 int rc;
1798 1798
@@ -1870,7 +1870,7 @@ cifs_set_file_size(struct inode *inode, struct iattr *attrs,
1870 struct cifsInodeInfo *cifsInode = CIFS_I(inode); 1870 struct cifsInodeInfo *cifsInode = CIFS_I(inode);
1871 struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb); 1871 struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb);
1872 struct tcon_link *tlink = NULL; 1872 struct tcon_link *tlink = NULL;
1873 struct cifsTconInfo *pTcon = NULL; 1873 struct cifs_tcon *pTcon = NULL;
1874 struct cifs_io_parms io_parms; 1874 struct cifs_io_parms io_parms;
1875 1875
1876 /* 1876 /*
@@ -1971,7 +1971,7 @@ cifs_setattr_unix(struct dentry *direntry, struct iattr *attrs)
1971 struct cifsInodeInfo *cifsInode = CIFS_I(inode); 1971 struct cifsInodeInfo *cifsInode = CIFS_I(inode);
1972 struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb); 1972 struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb);
1973 struct tcon_link *tlink; 1973 struct tcon_link *tlink;
1974 struct cifsTconInfo *pTcon; 1974 struct cifs_tcon *pTcon;
1975 struct cifs_unix_set_info_args *args = NULL; 1975 struct cifs_unix_set_info_args *args = NULL;
1976 struct cifsFileInfo *open_file; 1976 struct cifsFileInfo *open_file;
1977 1977
@@ -2257,7 +2257,7 @@ cifs_setattr(struct dentry *direntry, struct iattr *attrs)
2257{ 2257{
2258 struct inode *inode = direntry->d_inode; 2258 struct inode *inode = direntry->d_inode;
2259 struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb); 2259 struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb);
2260 struct cifsTconInfo *pTcon = cifs_sb_master_tcon(cifs_sb); 2260 struct cifs_tcon *pTcon = cifs_sb_master_tcon(cifs_sb);
2261 2261
2262 if (pTcon->unix_ext) 2262 if (pTcon->unix_ext)
2263 return cifs_setattr_unix(direntry, attrs); 2263 return cifs_setattr_unix(direntry, attrs);