From: Al Viro <viro@zeniv.linux.org.uk>
To: linux-fsdevel@vger.kernel.org
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
Christian Brauner <brauner@kernel.org>,
Christoph Hellwig <hch@lst.de>,
linux-block@vger.kernel.org, Jens Axboe <axboe@kernel.dk>,
linux-btrfs@vger.kernel.org,
"Rafael J. Wysocki" <rafael@kernel.org>,
Andrew Morton <akpm@linux-foundation.org>
Subject: [PATCH 5/7] swsusp: don't bother with setting block size
Date: Sat, 27 Apr 2024 22:11:56 +0100 [thread overview]
Message-ID: <20240427211156.GE1495312@ZenIV> (raw)
In-Reply-To: <20240427210920.GR2118490@ZenIV>
same as with the swap...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
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
next prev parent reply other threads:[~2024-04-27 21:11 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-27 21:09 [PATCHES][RFC] set_blocksize() rework Al Viro
2024-04-27 21:10 ` [PATCH 1/7] bcache_register(): don't bother with set_blocksize() Al Viro
2024-04-29 5:06 ` Christoph Hellwig
2024-04-29 8:37 ` Christian Brauner
2024-04-27 21:10 ` [PATCH 2/7] pktcdvd: sort set_blocksize() calls out Al Viro
2024-04-29 5:07 ` Christoph Hellwig
2024-04-29 8:38 ` Christian Brauner
2024-04-27 21:10 ` [PATCH 3/7] swapon(2)/swapoff(2): don't bother with block size Al Viro
2024-04-29 5:08 ` Christoph Hellwig
2024-04-29 8:38 ` Christian Brauner
2024-04-27 21:11 ` [PATCH 4/7] swapon(2): open swap with O_EXCL Al Viro
2024-04-27 21:40 ` Linus Torvalds
2024-04-27 23:46 ` Al Viro
2024-04-28 1:25 ` Al Viro
2024-04-28 18:19 ` Al Viro
2024-04-28 18:46 ` Linus Torvalds
2024-04-28 19:07 ` Al Viro
2024-04-29 5:10 ` Christoph Hellwig
2024-04-29 5:09 ` Christoph Hellwig
2024-04-29 8:39 ` Christian Brauner
2024-04-27 21:11 ` Al Viro [this message]
2024-04-29 5:10 ` [PATCH 5/7] swsusp: don't bother with setting block size Christoph Hellwig
2024-04-29 8:40 ` Christian Brauner
2024-04-27 21:12 ` [PATCH 6/7] btrfs_get_dev_args_from_path(): don't call set_blocksize() Al Viro
2024-04-29 5:11 ` Christoph Hellwig
2024-04-29 8:40 ` Christian Brauner
2024-04-29 15:11 ` David Sterba
2024-04-30 2:05 ` Al Viro
2024-04-27 21:13 ` [PATCH 7/7] set_blocksize(): switch to passing struct file *, fail if it's not opened exclusive Al Viro
2024-04-29 5:12 ` Christoph Hellwig
2024-04-29 8:42 ` Christian Brauner
2024-05-03 3:18 ` [PATCHES v2][RFC] set_blocksize() rework Al Viro
2024-05-03 4:17 ` [PATCH v2 1/9] bcache_register(): don't bother with set_blocksize() Al Viro
2024-05-03 4:17 ` [PATCH v2 2/9] pktcdvd: sort set_blocksize() calls out Al Viro
2024-05-03 4:17 ` [PATCH v2 3/9] swapon(2)/swapoff(2): don't bother with block size Al Viro
2024-05-03 4:17 ` [PATCH v2 4/9] swapon(2): open swap with O_EXCL Al Viro
2024-05-03 4:17 ` [PATCH v2 5/9] zram: don't bother with reopening - just use O_EXCL for open Al Viro
2024-05-03 4:17 ` [PATCH v2 6/9] swsusp: don't bother with setting block size Al Viro
2024-05-03 4:17 ` [PATCH v2 7/9] btrfs_get_bdev_and_sb(): call set_blocksize() only for exclusive opens Al Viro
2024-05-03 4:17 ` [PATCH v2 8/9] set_blocksize(): switch to passing struct file * Al Viro
2024-05-03 4:17 ` [PATCH v2 9/9] make set_blocksize() fail unless block device is opened exclusive Al Viro
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240427211156.GE1495312@ZenIV \
--to=viro@zeniv.linux.org.uk \
--cc=akpm@linux-foundation.org \
--cc=axboe@kernel.dk \
--cc=brauner@kernel.org \
--cc=hch@lst.de \
--cc=linux-block@vger.kernel.org \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=rafael@kernel.org \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).