From patchwork Thu Feb 27 21:11:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Simmons X-Patchwork-Id: 11410133 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0585A92A for ; Thu, 27 Feb 2020 21:31:05 +0000 (UTC) Received: from pdx1-mailman02.dreamhost.com (pdx1-mailman02.dreamhost.com [64.90.62.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E257C20801 for ; Thu, 27 Feb 2020 21:31:04 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E257C20801 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lustre-devel-bounces@lists.lustre.org Received: from pdx1-mailman02.dreamhost.com (localhost [IPv6:::1]) by pdx1-mailman02.dreamhost.com (Postfix) with ESMTP id 4D4B534975F; Thu, 27 Feb 2020 13:26:24 -0800 (PST) X-Original-To: lustre-devel@lists.lustre.org Delivered-To: lustre-devel-lustre.org@pdx1-mailman02.dreamhost.com Received: from smtp3.ccs.ornl.gov (smtp3.ccs.ornl.gov [160.91.203.39]) by pdx1-mailman02.dreamhost.com (Postfix) with ESMTP id 74D1221FBC5 for ; Thu, 27 Feb 2020 13:19:22 -0800 (PST) Received: from star.ccs.ornl.gov (star.ccs.ornl.gov [160.91.202.134]) by smtp3.ccs.ornl.gov (Postfix) with ESMTP id C22F42AE1; Thu, 27 Feb 2020 16:18:15 -0500 (EST) Received: by star.ccs.ornl.gov (Postfix, from userid 2004) id C003446F; Thu, 27 Feb 2020 16:18:15 -0500 (EST) From: James Simmons To: Andreas Dilger , Oleg Drokin , NeilBrown Date: Thu, 27 Feb 2020 16:11:18 -0500 Message-Id: <1582838290-17243-211-git-send-email-jsimmons@infradead.org> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1582838290-17243-1-git-send-email-jsimmons@infradead.org> References: <1582838290-17243-1-git-send-email-jsimmons@infradead.org> Subject: [lustre-devel] [PATCH 210/622] lustre: Ensure crc-t10pi is enabled. X-BeenThere: lustre-devel@lists.lustre.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "For discussing Lustre software development." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Lustre Development List MIME-Version: 1.0 Errors-To: lustre-devel-bounces@lists.lustre.org Sender: "lustre-devel" From: Andreas Dilger Also simplify check_write_checksum code a little - the var isn't needed. Fixes: 86e186db3ed ("lustre: osc: T10PI between RPC and BIO") WC-bug-id: https://jira.whamcloud.com/browse/LU-11770 Lustre-commit: e0fb3133372e ("LU-11770 osc: allow build without blk_integrity or crc-t10pi") Signed-off-by: Andreas Dilger Reviewed-on: https://review.whamcloud.com/33923 Reviewed-by: Li Dongyang Reviewed-by: Patrick Farrell Reviewed-by: James Simmons Reviewed-by: Oleg Drokin Signed-off-by: James Simmons --- fs/lustre/Kconfig | 1 + fs/lustre/osc/osc_request.c | 14 +++----------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/fs/lustre/Kconfig b/fs/lustre/Kconfig index 2eb7e45..bc89565 100644 --- a/fs/lustre/Kconfig +++ b/fs/lustre/Kconfig @@ -9,6 +9,7 @@ config LUSTRE_FS select CRYPTO_SHA1 select CRYPTO_SHA256 select CRYPTO_SHA512 + select CRC_T10DIF select DEBUG_FS select FHANDLE select QUOTA diff --git a/fs/lustre/osc/osc_request.c b/fs/lustre/osc/osc_request.c index ba84bd1..6ce22c3 100644 --- a/fs/lustre/osc/osc_request.c +++ b/fs/lustre/osc/osc_request.c @@ -1638,7 +1638,6 @@ static int check_write_checksum(struct obdo *oa, const char *obd_name = aa->aa_cli->cl_import->imp_obd->obd_name; obd_dif_csum_fn *fn = NULL; int sector_size = 0; - bool t10pi = false; u32 new_cksum; char *msg; enum cksum_type cksum_type; @@ -1658,22 +1657,18 @@ static int check_write_checksum(struct obdo *oa, switch (cksum_type) { case OBD_CKSUM_T10IP512: - t10pi = true; fn = obd_dif_ip_fn; sector_size = 512; break; case OBD_CKSUM_T10IP4K: - t10pi = true; fn = obd_dif_ip_fn; sector_size = 4096; break; case OBD_CKSUM_T10CRC512: - t10pi = true; fn = obd_dif_crc_fn; sector_size = 512; break; case OBD_CKSUM_T10CRC4K: - t10pi = true; fn = obd_dif_crc_fn; sector_size = 4096; break; @@ -1681,13 +1676,10 @@ static int check_write_checksum(struct obdo *oa, break; } - if (t10pi) + if (fn) rc = osc_checksum_bulk_t10pi(obd_name, aa->aa_requested_nob, - aa->aa_page_count, - aa->aa_ppga, - OST_WRITE, - fn, - sector_size, + aa->aa_page_count, aa->aa_ppga, + OST_WRITE, fn, sector_size, &new_cksum); else rc = osc_checksum_bulk(aa->aa_requested_nob, aa->aa_page_count,