[2/5] CIFS: Fix missing nls unload in smb2_reconnect()
diff mbox

Message ID 1480467416-13636-3-git-send-email-pshilov@microsoft.com
State New
Headers show

Commit Message

Pavel Shilovskiy Nov. 30, 2016, 12:56 a.m. UTC
Cc: Stable <stable@vger.kernel.org>
Signed-off-by: Pavel Shilovsky <pshilov@microsoft.com>
---
 fs/cifs/smb2pdu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Sachin Prabhu Dec. 5, 2016, 6:48 a.m. UTC | #1
On Tue, 2016-11-29 at 16:56 -0800, Pavel Shilovsky wrote:
> Cc: Stable <stable@vger.kernel.org>
> Signed-off-by: Pavel Shilovsky <pshilov@microsoft.com>

Acked-by: Sachin Prabhu <sprabhu@redhat.com>

> ---
>  fs/cifs/smb2pdu.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c
> index 5ca5ea46..730d57b 100644
> --- a/fs/cifs/smb2pdu.c
> +++ b/fs/cifs/smb2pdu.c
> @@ -280,7 +280,7 @@ smb2_reconnect(__le16 smb2_command, struct
> cifs_tcon *tcon)
>  	case SMB2_CHANGE_NOTIFY:
>  	case SMB2_QUERY_INFO:
>  	case SMB2_SET_INFO:
> -		return -EAGAIN;
> +		rc = -EAGAIN;
>  	}
>  	unload_nls(nls_codepage);
>  	return rc;

--
To unsubscribe from this list: send the line "unsubscribe linux-cifs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Steve French Dec. 5, 2016, 8:02 a.m. UTC | #2
Pavel,
I couldn't find the original for this patch.

Do you have a git tree I can pull them from?  I wanted to merge this
and your verbosity ioctl patch, and look to see if I had missed others
which are already reviewed and ready to merge into for-next

On Mon, Dec 5, 2016 at 12:48 AM, Sachin Prabhu <sprabhu@redhat.com> wrote:
> On Tue, 2016-11-29 at 16:56 -0800, Pavel Shilovsky wrote:
>> Cc: Stable <stable@vger.kernel.org>
>> Signed-off-by: Pavel Shilovsky <pshilov@microsoft.com>
>
> Acked-by: Sachin Prabhu <sprabhu@redhat.com>
>
>> ---
>>  fs/cifs/smb2pdu.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c
>> index 5ca5ea46..730d57b 100644
>> --- a/fs/cifs/smb2pdu.c
>> +++ b/fs/cifs/smb2pdu.c
>> @@ -280,7 +280,7 @@ smb2_reconnect(__le16 smb2_command, struct
>> cifs_tcon *tcon)
>>       case SMB2_CHANGE_NOTIFY:
>>       case SMB2_QUERY_INFO:
>>       case SMB2_SET_INFO:
>> -             return -EAGAIN;
>> +             rc = -EAGAIN;
>>       }
>>       unload_nls(nls_codepage);
>>       return rc;
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-cifs" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
Pavel Shilovsky Dec. 5, 2016, 7:03 p.m. UTC | #3
2016-12-05 0:02 GMT-08:00 Steve French <smfrench@gmail.com>:
> Pavel,
> I couldn't find the original for this patch.
>
> Do you have a git tree I can pull them from?  I wanted to merge this
> and your verbosity ioctl patch, and look to see if I had missed others
> which are already reviewed and ready to merge into for-next
>

Steve,

You can pull from https://github.com/piastry/linux/commits/stable-fixes.
Steve French Dec. 6, 2016, 5 a.m. UTC | #4
merged your stable series into cifs-2.6.git

On Mon, Dec 5, 2016 at 1:03 PM, Pavel Shilovsky <piastryyy@gmail.com> wrote:
> 2016-12-05 0:02 GMT-08:00 Steve French <smfrench@gmail.com>:
>> Pavel,
>> I couldn't find the original for this patch.
>>
>> Do you have a git tree I can pull them from?  I wanted to merge this
>> and your verbosity ioctl patch, and look to see if I had missed others
>> which are already reviewed and ready to merge into for-next
>>
>
> Steve,
>
> You can pull from https://github.com/piastry/linux/commits/stable-fixes.
>
> --
> Best regards,
> Pavel Shilovsky

Patch
diff mbox

diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c
index 5ca5ea46..730d57b 100644
--- a/fs/cifs/smb2pdu.c
+++ b/fs/cifs/smb2pdu.c
@@ -280,7 +280,7 @@  smb2_reconnect(__le16 smb2_command, struct cifs_tcon *tcon)
 	case SMB2_CHANGE_NOTIFY:
 	case SMB2_QUERY_INFO:
 	case SMB2_SET_INFO:
-		return -EAGAIN;
+		rc = -EAGAIN;
 	}
 	unload_nls(nls_codepage);
 	return rc;