diff options
Diffstat (limited to 'fs/cifs/readdir.c')
-rw-r--r-- | fs/cifs/readdir.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/cifs/readdir.c b/fs/cifs/readdir.c index f8e4cd2a7912..6751e745bbc6 100644 --- a/fs/cifs/readdir.c +++ b/fs/cifs/readdir.c | |||
@@ -195,7 +195,7 @@ int get_symlink_reparse_path(char *full_path, struct cifs_sb_info *cifs_sb, | |||
195 | int len; | 195 | int len; |
196 | int oplock = 0; | 196 | int oplock = 0; |
197 | int rc; | 197 | int rc; |
198 | struct cifsTconInfo *ptcon = cifs_sb_tcon(cifs_sb); | 198 | struct cifs_tcon *ptcon = cifs_sb_tcon(cifs_sb); |
199 | char *tmpbuffer; | 199 | char *tmpbuffer; |
200 | 200 | ||
201 | rc = CIFSSMBOpen(xid, ptcon, full_path, FILE_OPEN, GENERIC_READ, | 201 | rc = CIFSSMBOpen(xid, ptcon, full_path, FILE_OPEN, GENERIC_READ, |
@@ -223,7 +223,7 @@ static int initiate_cifs_search(const int xid, struct file *file) | |||
223 | struct cifsFileInfo *cifsFile; | 223 | struct cifsFileInfo *cifsFile; |
224 | struct cifs_sb_info *cifs_sb = CIFS_SB(file->f_path.dentry->d_sb); | 224 | struct cifs_sb_info *cifs_sb = CIFS_SB(file->f_path.dentry->d_sb); |
225 | struct tcon_link *tlink = NULL; | 225 | struct tcon_link *tlink = NULL; |
226 | struct cifsTconInfo *pTcon; | 226 | struct cifs_tcon *pTcon; |
227 | 227 | ||
228 | if (file->private_data == NULL) { | 228 | if (file->private_data == NULL) { |
229 | tlink = cifs_sb_tlink(cifs_sb); | 229 | tlink = cifs_sb_tlink(cifs_sb); |
@@ -496,7 +496,7 @@ static int cifs_save_resume_key(const char *current_entry, | |||
496 | assume that they are located in the findfirst return buffer.*/ | 496 | assume that they are located in the findfirst return buffer.*/ |
497 | /* We start counting in the buffer with entry 2 and increment for every | 497 | /* We start counting in the buffer with entry 2 and increment for every |
498 | entry (do not increment for . or .. entry) */ | 498 | entry (do not increment for . or .. entry) */ |
499 | static int find_cifs_entry(const int xid, struct cifsTconInfo *pTcon, | 499 | static int find_cifs_entry(const int xid, struct cifs_tcon *pTcon, |
500 | struct file *file, char **ppCurrentEntry, int *num_to_ret) | 500 | struct file *file, char **ppCurrentEntry, int *num_to_ret) |
501 | { | 501 | { |
502 | int rc = 0; | 502 | int rc = 0; |
@@ -764,7 +764,7 @@ int cifs_readdir(struct file *file, void *direntry, filldir_t filldir) | |||
764 | { | 764 | { |
765 | int rc = 0; | 765 | int rc = 0; |
766 | int xid, i; | 766 | int xid, i; |
767 | struct cifsTconInfo *pTcon; | 767 | struct cifs_tcon *pTcon; |
768 | struct cifsFileInfo *cifsFile = NULL; | 768 | struct cifsFileInfo *cifsFile = NULL; |
769 | char *current_entry; | 769 | char *current_entry; |
770 | int num_to_fill = 0; | 770 | int num_to_fill = 0; |