From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from zeniv.linux.org.uk (zeniv.linux.org.uk [62.89.141.173]) (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 A74FF1B299; Fri, 3 May 2024 03:23:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=62.89.141.173 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714706619; cv=none; b=CBTsFs/pI6DVC+cwQrOmTw7baCMw2ydA8QdK/BEUVilO8FjOV0HrtK6PpzK8kYWf8K3ew+RSQHPjvGEaQzJl9V5/2yfVX6BVhbnPbtDSbDEvLnStN3nrGD9v2KcBGiJJLbQYLlMVrCUnVmZX0q9i7geh/QxfZ6LBPkeG0XkX9kI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714706619; c=relaxed/simple; bh=coQnFaUQk+YonHP9VZcg1wZRWOXon1n6rf16Uoitesw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Y7I5f8CiBsAr0RSd1868Vf/Y6HVN2UcJ+enVWADu+CTAZm5Uto8KbHjIFIJ2HkrzBU8404QsAdS4PPsrlunxaa8KmhTh/xn+5eVBkJTNWkzGJF3sJ5A3nK9YZiCDAUTkOxk2TJ5R6oqy2m+i9paZW4J+i3/+Y+0Pk2H0A+LkKms= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=zeniv.linux.org.uk; spf=none smtp.mailfrom=ftp.linux.org.uk; dkim=pass (2048-bit key) header.d=linux.org.uk header.i=@linux.org.uk header.b=g+Eqsup9; arc=none smtp.client-ip=62.89.141.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=zeniv.linux.org.uk Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=ftp.linux.org.uk Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linux.org.uk header.i=@linux.org.uk header.b="g+Eqsup9" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=linux.org.uk; s=zeniv-20220401; h=Sender:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description; bh=cwCXl7bDNgEK3wEeB1dHuYl82HeOEvaS0e413hiuNX4=; b=g+Eqsup9JNOHEYfCE32VG18AWm 7XWmN+HFgVTYrb441G625Ti6JvwG0GsoemplB+bAIfMS6RxeDB1mQpt8Gzmuyha/tdQlOIioA4z0b hCO6nE+LhIEjEprz/fA/F5ZO0HewVWiDpjHQVQ69SGTj75rFp9whVITT3+RjROME4X/4MNoVMJ1gS K+hwH0TgxPE6BrO3KGsBLdQwe674rDozvXZsrlvc3w/ZphJwe0I/XJwXKIyz2Y6yd2rb741HiRZtz kd4QJPPm/IrlydeGFmVTz5N34m9Zz7b0so/HG1mc6gYhJCyUbmGaUlah5KJpwHJIFMt1o3qsbFfa5 wYIx64fg==; Received: from viro by zeniv.linux.org.uk with local (Exim 4.96 #2 (Red Hat Linux)) id 1s2jWE-00A2W0-1h; Fri, 03 May 2024 03:23:30 +0000 From: Al Viro To: linux-fsdevel@vger.org Cc: Linus Torvalds , Christian Brauner , Christoph Hellwig , linux-block@vger.kernel.org, Jens Axboe , linux-btrfs@vger.kernel.org, "Rafael J. Wysocki" , Andrew Morton Subject: [PATCH v2 6/9] swsusp: don't bother with setting block size Date: Fri, 3 May 2024 04:23:26 +0100 Message-Id: <20240503032329.2392931-6-viro@zeniv.linux.org.uk> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240503032329.2392931-1-viro@zeniv.linux.org.uk> References: <20240503031833.GU2118490@ZenIV> <20240503032329.2392931-1-viro@zeniv.linux.org.uk> Precedence: bulk X-Mailing-List: linux-block@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: Al Viro same as with the swap... Reviewed-by: Christoph Hellwig Reviewed-by: Christian Brauner Signed-off-by: Al Viro --- kernel/power/swap.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/kernel/power/swap.c b/kernel/power/swap.c index 5bc04bfe2db1..d9abb7ab031d 100644 --- a/kernel/power/swap.c +++ b/kernel/power/swap.c @@ -368,11 +368,7 @@ static int swsusp_swap_check(void) if (IS_ERR(hib_resume_bdev_file)) return PTR_ERR(hib_resume_bdev_file); - res = set_blocksize(file_bdev(hib_resume_bdev_file), PAGE_SIZE); - if (res < 0) - fput(hib_resume_bdev_file); - - return res; + return 0; } /** @@ -1574,7 +1570,6 @@ int swsusp_check(bool exclusive) hib_resume_bdev_file = bdev_file_open_by_dev(swsusp_resume_device, BLK_OPEN_READ, holder, NULL); if (!IS_ERR(hib_resume_bdev_file)) { - set_blocksize(file_bdev(hib_resume_bdev_file), PAGE_SIZE); clear_page(swsusp_header); error = hib_submit_io(REQ_OP_READ, swsusp_resume_block, swsusp_header, NULL); -- 2.39.2