projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
netfs: Make CONFIG_NETFS_SUPPORT auto-selected rather than manual
[linux-2.6-microblaze.git]
/
fs
/
cifs
/
smb2inode.c
diff --git
a/fs/cifs/smb2inode.c
b/fs/cifs/smb2inode.c
index
a718dc7
..
9a61209
100644
(file)
--- a/
fs/cifs/smb2inode.c
+++ b/
fs/cifs/smb2inode.c
@@
-512,7
+512,6
@@
smb2_query_path_info(const unsigned int xid, struct cifs_tcon *tcon,
int rc;
struct smb2_file_all_info *smb2_data;
__u32 create_options = 0;
int rc;
struct smb2_file_all_info *smb2_data;
__u32 create_options = 0;
- bool no_cached_open = tcon->nohandlecache;
struct cifsFileInfo *cfile;
struct cached_fid *cfid = NULL;
struct cifsFileInfo *cfile;
struct cached_fid *cfid = NULL;
@@
-525,11
+524,8
@@
smb2_query_path_info(const unsigned int xid, struct cifs_tcon *tcon,
return -ENOMEM;
/* If it is a root and its handle is cached then use it */
return -ENOMEM;
/* If it is a root and its handle is cached then use it */
- if (!strlen(full_path) && !no_cached_open) {
- rc = open_shroot(xid, tcon, cifs_sb, &cfid);
- if (rc)
- goto out;
-
+ rc = open_cached_dir(xid, tcon, full_path, cifs_sb, &cfid);
+ if (!rc) {
if (tcon->crfid.file_all_info_is_valid) {
move_smb2_info_to_cifs(data,
&tcon->crfid.file_all_info);
if (tcon->crfid.file_all_info_is_valid) {
move_smb2_info_to_cifs(data,
&tcon->crfid.file_all_info);
@@
-540,7
+536,7
@@
smb2_query_path_info(const unsigned int xid, struct cifs_tcon *tcon,
if (!rc)
move_smb2_info_to_cifs(data, smb2_data);
}
if (!rc)
move_smb2_info_to_cifs(data, smb2_data);
}
- close_
shroot
(cfid);
+ close_
cached_dir
(cfid);
goto out;
}
goto out;
}