| From 19e81573fca7b87ced7701e01ba164b968d929bd Mon Sep 17 00:00:00 2001 |
| From: Steve French <smfrench@gmail.com> |
| Date: Thu, 25 Sep 2014 01:26:55 -0500 |
| Subject: Fix problem recognizing symlinks |
| |
| From: Steve French <smfrench@gmail.com> |
| |
| commit 19e81573fca7b87ced7701e01ba164b968d929bd upstream. |
| |
| Changeset eb85d94bd 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> |
| |
| --- |
| fs/cifs/smb1ops.c | 2 +- |
| fs/cifs/smb2maperror.c | 2 ++ |
| 2 files changed, 3 insertions(+), 1 deletion(-) |
| |
| --- a/fs/cifs/smb1ops.c |
| +++ b/fs/cifs/smb1ops.c |
| @@ -586,7 +586,7 @@ cifs_query_path_info(const unsigned int |
| tmprc = CIFS_open(xid, &oparms, &oplock, NULL); |
| if (tmprc == -EOPNOTSUPP) |
| *symlink = true; |
| - else |
| + else if (tmprc == 0) |
| CIFSSMBClose(xid, tcon, fid.netfid); |
| } |
| |
| --- a/fs/cifs/smb2maperror.c |
| +++ b/fs/cifs/smb2maperror.c |
| @@ -256,6 +256,8 @@ static const struct status_to_posix_erro |
| {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"}, |
