| Date | Sun, 06 Dec 2009 15:59:38 -0800 | From | Greg KH <> | Subject | [002/119] cifs: dont use CIFSGetSrvInodeNumber in is_path_accessible |
| |
2.6.31-stable review patch. If anyone has any objections, please let us know.
------------------ From: Jeff Layton <jlayton@redhat.com>
commit f475f6775465283494346663f201ad04810d2e8a upstream.
Because it's lighter weight, CIFS tries to use CIFSGetSrvInodeNumber to verify the accessibility of the root inode and then falls back to doing a full QPathInfo if that fails with -EOPNOTSUPP. I have at least a report of a server that returns NT_STATUS_INTERNAL_ERROR rather than something that translates to EOPNOTSUPP.
Rather than trying to be clever with that call, just have is_path_accessible do a normal QPathInfo. That call is widely supported and it shouldn't increase the overhead significantly.
Signed-off-by: Jeff Layton <jlayton@redhat.com> Signed-off-by: Steve French <sfrench@us.ibm.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- fs/cifs/connect.c | 8 -------- 1 file changed, 8 deletions(-)
--- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c @@ -2200,16 +2200,8 @@ is_path_accessible(int xid, struct cifsT struct cifs_sb_info *cifs_sb, const char *full_path) { int rc; - __u64 inode_num; FILE_ALL_INFO *pfile_info; - rc = CIFSGetSrvInodeNumber(xid, tcon, full_path, &inode_num, - cifs_sb->local_nls, - cifs_sb->mnt_cifs_flags & - CIFS_MOUNT_MAP_SPECIAL_CHR); - if (rc != -EOPNOTSUPP) - return rc; - pfile_info = kmalloc(sizeof(FILE_ALL_INFO), GFP_KERNEL); if (pfile_info == NULL) return -ENOMEM;
|