From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9357412DDBC; Tue, 23 Jan 2024 01:02:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705971734; cv=none; b=QxBdHtCSfQrBPQv5ruFbGnSSfK/1+MvjdxbiWTf5I4gu/DpKWwfw/I2RpwMgJF0H9dmWsXrx1Ogk4r2Qly5LlKMQAjLvaos03uNLL6SYKlHv7PCm1iR8rnzqU1TUzo59Rnrr2K9vl2nZH2+PlFxyenZpD3Gehwi/KGv/l1pdidY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705971734; c=relaxed/simple; bh=FHLXCkYJG86N7i+xnhXeaZrbk2hoPKxlNfDibv7km6U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GGxaw0tXQP0Q2RD6aZ3N61kclu6viUWUDdbKOZI//cyqngvPUPBpXzXzbW5X/5YqcYzKO2l4YQcBRGNBlG7lvoCoXjtRvCUnPq1vEOF20v7Nr1JRBFFlw9/fb04AVjILXpG8YvSyzqOy05e3tjYtP+diO1K63Cs3DabXPUqbg2I= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=ETTrFKVy; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="ETTrFKVy" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9FBABC433C7; Tue, 23 Jan 2024 01:02:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1705971734; bh=FHLXCkYJG86N7i+xnhXeaZrbk2hoPKxlNfDibv7km6U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ETTrFKVyu0ZPFIRDhdi6JydUx5zLqZvKgH6J6brHOD4K74QkcFlTXa+RrvaBppkdR SIqjDken/AvqTGlJyTFV0I0usfOLjU+Xhr6xyCGvHA6V9zOCJBPy+EMMRFs5AHUrjD dlgg1mv6mLnCIe6dP/dAxizL8tCeLZzRIbfFstww= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Christoph Hellwig , Amir Goldstein , "Martin K. Petersen" , Jens Axboe , Christian Brauner Subject: [PATCH 6.1 290/417] scsi: target: core: add missing file_{start,end}_write() Date: Mon, 22 Jan 2024 15:57:38 -0800 Message-ID: <20240122235801.875755162@linuxfoundation.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240122235751.480367507@linuxfoundation.org> References: <20240122235751.480367507@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Amir Goldstein commit 0db1d53937fafa8bb96e077375691e16902f4899 upstream. The callers of vfs_iter_write() are required to hold file_start_write(). file_start_write() is a no-op for the S_ISBLK() case, but it is really needed when the backing file is a regular file. We are going to move file_{start,end}_write() into vfs_iter_write(), but we need to fix this first, so that the fix could be backported to stable kernels. Suggested-by: Christoph Hellwig Link: https://lore.kernel.org/r/ZV8ETIpM+wZa33B5@infradead.org/ Cc: Signed-off-by: Amir Goldstein Link: https://lore.kernel.org/r/20231123092000.2665902-1-amir73il@gmail.com Acked-by: Martin K. Petersen Reviewed-by: Christoph Hellwig Reviewed-by: Jens Axboe Signed-off-by: Christian Brauner Signed-off-by: Greg Kroah-Hartman --- drivers/target/target_core_file.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) --- a/drivers/target/target_core_file.c +++ b/drivers/target/target_core_file.c @@ -338,11 +338,13 @@ static int fd_do_rw(struct se_cmd *cmd, } iov_iter_bvec(&iter, is_write, bvec, sgl_nents, len); - if (is_write) + if (is_write) { + file_start_write(fd); ret = vfs_iter_write(fd, &iter, &pos, 0); - else + file_end_write(fd); + } else { ret = vfs_iter_read(fd, &iter, &pos, 0); - + } if (is_write) { if (ret < 0 || ret != data_length) { pr_err("%s() write returned %d\n", __func__, ret); @@ -474,7 +476,9 @@ fd_execute_write_same(struct se_cmd *cmd } iov_iter_bvec(&iter, ITER_SOURCE, bvec, nolb, len); + file_start_write(fd_dev->fd_file); ret = vfs_iter_write(fd_dev->fd_file, &iter, &pos, 0); + file_end_write(fd_dev->fd_file); kfree(bvec); if (ret < 0 || ret != len) {