From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:36116 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752075AbdEQP5O (ORCPT ); Wed, 17 May 2017 11:57:14 -0400 Subject: Patch "Do not return number of bytes written for ioctl CIFS_IOC_COPYCHUNK_FILE" has been added to the 4.11-stable tree To: sprabhu@redhat.com, eguan@redhat.com, gregkh@linuxfoundation.org, pshilov@microsoft.com, smfrench@gmail.com Cc: , From: Date: Wed, 17 May 2017 17:55:54 +0200 Message-ID: <1495036554155244@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled Do not return number of bytes written for ioctl CIFS_IOC_COPYCHUNK_FILE to the 4.11-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: do-not-return-number-of-bytes-written-for-ioctl-cifs_ioc_copychunk_file.patch and it can be found in the queue-4.11 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From 7d0c234fd2e1c9ca3fa032696c0c58b1b74a9e0b Mon Sep 17 00:00:00 2001 From: Sachin Prabhu Date: Wed, 26 Apr 2017 17:10:17 +0100 Subject: Do not return number of bytes written for ioctl CIFS_IOC_COPYCHUNK_FILE From: Sachin Prabhu commit 7d0c234fd2e1c9ca3fa032696c0c58b1b74a9e0b upstream. commit 620d8745b35d ("Introduce cifs_copy_file_range()") changes the behaviour of the cifs ioctl call CIFS_IOC_COPYCHUNK_FILE. In case of successful writes, it now returns the number of bytes written. This return value is treated as an error by the xfstest cifs/001. Depending on the errno set at that time, this may or may not result in the test failing. The patch fixes this by setting the return value to 0 in case of successful writes. Fixes: commit 620d8745b35d ("Introduce cifs_copy_file_range()") Reported-by: Eryu Guan Signed-off-by: Sachin Prabhu Acked-by: Pavel Shilovsky Signed-off-by: Steve French Signed-off-by: Greg Kroah-Hartman --- fs/cifs/ioctl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/fs/cifs/ioctl.c +++ b/fs/cifs/ioctl.c @@ -74,7 +74,8 @@ static long cifs_ioctl_copychunk(unsigne rc = cifs_file_copychunk_range(xid, src_file.file, 0, dst_file, 0, src_inode->i_size, 0); - + if (rc > 0) + rc = 0; out_fput: fdput(src_file); out_drop_write: Patches currently in stable-queue which might be from sprabhu@redhat.com are queue-4.11/do-not-return-number-of-bytes-written-for-ioctl-cifs_ioc_copychunk_file.patch queue-4.11/fix-match_prepath.patch