Skip to content

Commit

Permalink
Fix problem recognizing symlinks
Browse files Browse the repository at this point in the history
commit 19e8157 upstream.

Changeset eb85d94 introduced a problem where if a cifs open
fails during query info of a file we
will still try to close the file (happens with certain types
of reparse points) even though the file handle is not valid.

In addition for SMB2/SMB3 we were not mapping the return code returned
by Windows when trying to open a file (like a Windows NFS symlink)
which is a reparse point.

Signed-off-by: Steve French <smfrench@gmail.com>
Reviewed-by: Pavel Shilovsky <pshilovsky@samba.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Steve French authored and Greg Kroah-Hartman committed Oct 9, 2014
1 parent 7365af4 commit f012edf
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion fs/cifs/smb1ops.c
Original file line number Diff line number Diff line change
Expand Up @@ -586,7 +586,7 @@ cifs_query_path_info(const unsigned int xid, struct cifs_tcon *tcon,
tmprc = CIFS_open(xid, &oparms, &oplock, NULL);
if (tmprc == -EOPNOTSUPP)
*symlink = true;
else
else if (tmprc == 0)
CIFSSMBClose(xid, tcon, fid.netfid);
}

Expand Down
2 changes: 2 additions & 0 deletions fs/cifs/smb2maperror.c
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,8 @@ static const struct status_to_posix_error smb2_error_map_table[] = {
{STATUS_DLL_MIGHT_BE_INCOMPATIBLE, -EIO,
"STATUS_DLL_MIGHT_BE_INCOMPATIBLE"},
{STATUS_STOPPED_ON_SYMLINK, -EOPNOTSUPP, "STATUS_STOPPED_ON_SYMLINK"},
{STATUS_IO_REPARSE_TAG_NOT_HANDLED, -EOPNOTSUPP,
"STATUS_REPARSE_NOT_HANDLED"},
{STATUS_DEVICE_REQUIRES_CLEANING, -EIO,
"STATUS_DEVICE_REQUIRES_CLEANING"},
{STATUS_DEVICE_DOOR_OPEN, -EIO, "STATUS_DEVICE_DOOR_OPEN"},
Expand Down

0 comments on commit f012edf

Please sign in to comment.