diff options
author | Steve French <sfrench@us.ibm.com> | 2011-05-27 00:34:02 -0400 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2011-05-27 00:34:02 -0400 |
commit | 96daf2b09178d8ebde2b0d56b027de917c17dfdf (patch) | |
tree | 74802fa44e87925e49067d5106eb762cc27b9b97 /fs/cifs/file.c | |
parent | 07cc6cf9ef84bcf6a60ee513332bcb0ad5d628d8 (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/file.c')
-rw-r--r-- | fs/cifs/file.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/fs/cifs/file.c b/fs/cifs/file.c index 7db74d17a429..bb71471a4d9d 100644 --- a/fs/cifs/file.c +++ b/fs/cifs/file.c | |||
@@ -114,7 +114,7 @@ int cifs_posix_open(char *full_path, struct inode **pinode, | |||
114 | struct cifs_sb_info *cifs_sb = CIFS_SB(sb); | 114 | struct cifs_sb_info *cifs_sb = CIFS_SB(sb); |
115 | struct cifs_fattr fattr; | 115 | struct cifs_fattr fattr; |
116 | struct tcon_link *tlink; | 116 | struct tcon_link *tlink; |
117 | struct cifsTconInfo *tcon; | 117 | struct cifs_tcon *tcon; |
118 | 118 | ||
119 | cFYI(1, "posix open %s", full_path); | 119 | cFYI(1, "posix open %s", full_path); |
120 | 120 | ||
@@ -168,7 +168,7 @@ posix_open_ret: | |||
168 | 168 | ||
169 | static int | 169 | static int |
170 | cifs_nt_open(char *full_path, struct inode *inode, struct cifs_sb_info *cifs_sb, | 170 | cifs_nt_open(char *full_path, struct inode *inode, struct cifs_sb_info *cifs_sb, |
171 | struct cifsTconInfo *tcon, unsigned int f_flags, __u32 *poplock, | 171 | struct cifs_tcon *tcon, unsigned int f_flags, __u32 *poplock, |
172 | __u16 *pnetfid, int xid) | 172 | __u16 *pnetfid, int xid) |
173 | { | 173 | { |
174 | int rc; | 174 | int rc; |
@@ -285,7 +285,7 @@ cifs_new_fileinfo(__u16 fileHandle, struct file *file, | |||
285 | void cifsFileInfo_put(struct cifsFileInfo *cifs_file) | 285 | void cifsFileInfo_put(struct cifsFileInfo *cifs_file) |
286 | { | 286 | { |
287 | struct inode *inode = cifs_file->dentry->d_inode; | 287 | struct inode *inode = cifs_file->dentry->d_inode; |
288 | struct cifsTconInfo *tcon = tlink_tcon(cifs_file->tlink); | 288 | struct cifs_tcon *tcon = tlink_tcon(cifs_file->tlink); |
289 | struct cifsInodeInfo *cifsi = CIFS_I(inode); | 289 | struct cifsInodeInfo *cifsi = CIFS_I(inode); |
290 | struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb); | 290 | struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb); |
291 | struct cifsLockInfo *li, *tmp; | 291 | struct cifsLockInfo *li, *tmp; |
@@ -343,7 +343,7 @@ int cifs_open(struct inode *inode, struct file *file) | |||
343 | int xid; | 343 | int xid; |
344 | __u32 oplock; | 344 | __u32 oplock; |
345 | struct cifs_sb_info *cifs_sb; | 345 | struct cifs_sb_info *cifs_sb; |
346 | struct cifsTconInfo *tcon; | 346 | struct cifs_tcon *tcon; |
347 | struct tcon_link *tlink; | 347 | struct tcon_link *tlink; |
348 | struct cifsFileInfo *pCifsFile = NULL; | 348 | struct cifsFileInfo *pCifsFile = NULL; |
349 | char *full_path = NULL; | 349 | char *full_path = NULL; |
@@ -457,7 +457,7 @@ static int cifs_reopen_file(struct cifsFileInfo *pCifsFile, bool can_flush) | |||
457 | int xid; | 457 | int xid; |
458 | __u32 oplock; | 458 | __u32 oplock; |
459 | struct cifs_sb_info *cifs_sb; | 459 | struct cifs_sb_info *cifs_sb; |
460 | struct cifsTconInfo *tcon; | 460 | struct cifs_tcon *tcon; |
461 | struct cifsInodeInfo *pCifsInode; | 461 | struct cifsInodeInfo *pCifsInode; |
462 | struct inode *inode; | 462 | struct inode *inode; |
463 | char *full_path = NULL; | 463 | char *full_path = NULL; |
@@ -596,7 +596,7 @@ int cifs_closedir(struct inode *inode, struct file *file) | |||
596 | xid = GetXid(); | 596 | xid = GetXid(); |
597 | 597 | ||
598 | if (pCFileStruct) { | 598 | if (pCFileStruct) { |
599 | struct cifsTconInfo *pTcon = tlink_tcon(pCFileStruct->tlink); | 599 | struct cifs_tcon *pTcon = tlink_tcon(pCFileStruct->tlink); |
600 | 600 | ||
601 | cFYI(1, "Freeing private data in close dir"); | 601 | cFYI(1, "Freeing private data in close dir"); |
602 | spin_lock(&cifs_file_list_lock); | 602 | spin_lock(&cifs_file_list_lock); |
@@ -653,7 +653,7 @@ int cifs_lock(struct file *file, int cmd, struct file_lock *pfLock) | |||
653 | __u64 length; | 653 | __u64 length; |
654 | bool wait_flag = false; | 654 | bool wait_flag = false; |
655 | struct cifs_sb_info *cifs_sb; | 655 | struct cifs_sb_info *cifs_sb; |
656 | struct cifsTconInfo *tcon; | 656 | struct cifs_tcon *tcon; |
657 | __u16 netfid; | 657 | __u16 netfid; |
658 | __u8 lockType = LOCKING_ANDX_LARGE_FILES; | 658 | __u8 lockType = LOCKING_ANDX_LARGE_FILES; |
659 | bool posix_locking = 0; | 659 | bool posix_locking = 0; |
@@ -865,7 +865,7 @@ static ssize_t cifs_write(struct cifsFileInfo *open_file, __u32 pid, | |||
865 | unsigned int bytes_written = 0; | 865 | unsigned int bytes_written = 0; |
866 | unsigned int total_written; | 866 | unsigned int total_written; |
867 | struct cifs_sb_info *cifs_sb; | 867 | struct cifs_sb_info *cifs_sb; |
868 | struct cifsTconInfo *pTcon; | 868 | struct cifs_tcon *pTcon; |
869 | int xid; | 869 | int xid; |
870 | struct dentry *dentry = open_file->dentry; | 870 | struct dentry *dentry = open_file->dentry; |
871 | struct cifsInodeInfo *cifsi = CIFS_I(dentry->d_inode); | 871 | struct cifsInodeInfo *cifsi = CIFS_I(dentry->d_inode); |
@@ -1405,7 +1405,7 @@ int cifs_strict_fsync(struct file *file, int datasync) | |||
1405 | { | 1405 | { |
1406 | int xid; | 1406 | int xid; |
1407 | int rc = 0; | 1407 | int rc = 0; |
1408 | struct cifsTconInfo *tcon; | 1408 | struct cifs_tcon *tcon; |
1409 | struct cifsFileInfo *smbfile = file->private_data; | 1409 | struct cifsFileInfo *smbfile = file->private_data; |
1410 | struct inode *inode = file->f_path.dentry->d_inode; | 1410 | struct inode *inode = file->f_path.dentry->d_inode; |
1411 | struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb); | 1411 | struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb); |
@@ -1435,7 +1435,7 @@ int cifs_fsync(struct file *file, int datasync) | |||
1435 | { | 1435 | { |
1436 | int xid; | 1436 | int xid; |
1437 | int rc = 0; | 1437 | int rc = 0; |
1438 | struct cifsTconInfo *tcon; | 1438 | struct cifs_tcon *tcon; |
1439 | struct cifsFileInfo *smbfile = file->private_data; | 1439 | struct cifsFileInfo *smbfile = file->private_data; |
1440 | struct cifs_sb_info *cifs_sb = CIFS_SB(file->f_path.dentry->d_sb); | 1440 | struct cifs_sb_info *cifs_sb = CIFS_SB(file->f_path.dentry->d_sb); |
1441 | 1441 | ||
@@ -1526,7 +1526,7 @@ cifs_iovec_write(struct file *file, const struct iovec *iov, | |||
1526 | struct iov_iter it; | 1526 | struct iov_iter it; |
1527 | struct inode *inode; | 1527 | struct inode *inode; |
1528 | struct cifsFileInfo *open_file; | 1528 | struct cifsFileInfo *open_file; |
1529 | struct cifsTconInfo *pTcon; | 1529 | struct cifs_tcon *pTcon; |
1530 | struct cifs_sb_info *cifs_sb; | 1530 | struct cifs_sb_info *cifs_sb; |
1531 | struct cifs_io_parms io_parms; | 1531 | struct cifs_io_parms io_parms; |
1532 | int xid, rc; | 1532 | int xid, rc; |
@@ -1693,7 +1693,7 @@ cifs_iovec_read(struct file *file, const struct iovec *iov, | |||
1693 | size_t len, cur_len; | 1693 | size_t len, cur_len; |
1694 | int iov_offset = 0; | 1694 | int iov_offset = 0; |
1695 | struct cifs_sb_info *cifs_sb; | 1695 | struct cifs_sb_info *cifs_sb; |
1696 | struct cifsTconInfo *pTcon; | 1696 | struct cifs_tcon *pTcon; |
1697 | struct cifsFileInfo *open_file; | 1697 | struct cifsFileInfo *open_file; |
1698 | struct smb_com_read_rsp *pSMBr; | 1698 | struct smb_com_read_rsp *pSMBr; |
1699 | struct cifs_io_parms io_parms; | 1699 | struct cifs_io_parms io_parms; |
@@ -1815,7 +1815,7 @@ static ssize_t cifs_read(struct file *file, char *read_data, size_t read_size, | |||
1815 | unsigned int total_read; | 1815 | unsigned int total_read; |
1816 | unsigned int current_read_size; | 1816 | unsigned int current_read_size; |
1817 | struct cifs_sb_info *cifs_sb; | 1817 | struct cifs_sb_info *cifs_sb; |
1818 | struct cifsTconInfo *pTcon; | 1818 | struct cifs_tcon *pTcon; |
1819 | int xid; | 1819 | int xid; |
1820 | char *current_offset; | 1820 | char *current_offset; |
1821 | struct cifsFileInfo *open_file; | 1821 | struct cifsFileInfo *open_file; |
@@ -1998,7 +1998,7 @@ static int cifs_readpages(struct file *file, struct address_space *mapping, | |||
1998 | loff_t offset; | 1998 | loff_t offset; |
1999 | struct page *page; | 1999 | struct page *page; |
2000 | struct cifs_sb_info *cifs_sb; | 2000 | struct cifs_sb_info *cifs_sb; |
2001 | struct cifsTconInfo *pTcon; | 2001 | struct cifs_tcon *pTcon; |
2002 | unsigned int bytes_read = 0; | 2002 | unsigned int bytes_read = 0; |
2003 | unsigned int read_size, i; | 2003 | unsigned int read_size, i; |
2004 | char *smb_read_data = NULL; | 2004 | char *smb_read_data = NULL; |