* linux-next: manual merge of the block tree with the gfs2 tree
@ 2020-07-07 2:26 Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2020-07-07 2:26 UTC (permalink / raw)
To: Jens Axboe, Steven Whitehouse, Bob Peterson
Cc: Linux Next Mailing List, Linux Kernel Mailing List,
Andreas Gruenbacher
[-- Attachment #1: Type: text/plain, Size: 1686 bytes --]
Hi all,
Today's linux-next merge of the block tree got conflicts in:
include/linux/fs.h
mm/filemap.c
between commit:
00a83a3c014a ("fs: Add IOCB_NOIO flag for generic_file_read_iter")
from the gfs2 tree and commits:
dd3e6d5039de ("mm: add support for async page locking")
2e85abf053b9 ("mm: allow read-ahead with IOCB_NOWAIT set")
from the block tree.
I fixed it up (I think - see below) and can carry the fix as
necessary. This is now fixed as far as linux-next is concerned, but any
non trivial conflicts should be mentioned to your upstream maintainer
when your tree is submitted for merging. You may also want to consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc include/linux/fs.h
index 90b9f8b4c540,da90323b9f92..000000000000
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@@ -315,7 -318,8 +318,9 @@@ enum rw_hint
#define IOCB_SYNC (1 << 5)
#define IOCB_WRITE (1 << 6)
#define IOCB_NOWAIT (1 << 7)
+#define IOCB_NOIO (1 << 8)
+ /* iocb->ki_waitq is valid */
-#define IOCB_WAITQ (1 << 8)
++#define IOCB_WAITQ (1 << 9)
struct kiocb {
struct file *ki_filp;
diff --cc mm/filemap.c
index 10e7eb3aada0,a5b1fa8f7ce4..000000000000
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@@ -2028,8 -2044,6 +2044,8 @@@ find_page
page = find_get_page(mapping, index);
if (!page) {
- if (iocb->ki_flags & (IOCB_NOWAIT | IOCB_NOIO))
++ if (iocb->ki_flags & IOCB_NOIO)
+ goto would_block;
page_cache_sync_readahead(mapping,
ra, filp,
index, last_index - index);
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* linux-next: manual merge of the block tree with the gfs2 tree
@ 2020-07-08 3:13 Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2020-07-08 3:13 UTC (permalink / raw)
To: Jens Axboe, Steven Whitehouse, Bob Peterson
Cc: Linux Next Mailing List, Linux Kernel Mailing List,
Andreas Gruenbacher
[-- Attachment #1: Type: text/plain, Size: 1560 bytes --]
Hi all,
Today's linux-next merge of the block tree got a conflict in:
mm/filemap.c
between commit:
f0091f595dee ("fs: Add IOCB_NOIO flag for generic_file_read_iter")
from the gfs2 tree and commits:
2e85abf053b9 ("mm: allow read-ahead with IOCB_NOWAIT set")
dd3e6d5039de ("mm: add support for async page locking")
from the block tree.
The gfs2 tree commit has changed from the previous report.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc mm/filemap.c
index 6a6ed95e33a2,a5b1fa8f7ce4..000000000000
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@@ -2028,8 -2044,6 +2044,8 @@@ find_page
page = find_get_page(mapping, index);
if (!page) {
- if (iocb->ki_flags & (IOCB_NOWAIT | IOCB_NOIO))
++ if (iocb->ki_flags & IOCB_NOIO)
+ goto would_block;
page_cache_sync_readahead(mapping,
ra, filp,
index, last_index - index);
@@@ -2164,7 -2185,7 +2191,7 @@@ page_not_up_to_date_locked
}
readpage:
- if (iocb->ki_flags & IOCB_NOIO) {
- if (iocb->ki_flags & IOCB_NOWAIT) {
++ if (iocb->ki_flags & (IOCB_NOWAIT |IOCB_NOIO)) {
unlock_page(page);
put_page(page);
goto would_block;
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* linux-next: manual merge of the block tree with the gfs2 tree
@ 2025-05-08 3:50 Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2025-05-08 3:50 UTC (permalink / raw)
To: Jens Axboe, Andreas Gruenbacher, Steven Whitehouse
Cc: Christoph Hellwig, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 2059 bytes --]
Hi all,
Today's linux-next merge of the block tree got a conflict in:
fs/gfs2/ops_fstype.c
between commit:
2abc01ae2685 ("gfs2: Use SECTOR_SIZE and SECTOR_SHIFT")
from the gfs2 tree and commit:
65f8e62593e6 ("gfs2: use bdev_rw_virt in gfs2_read_super")
from the block tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc fs/gfs2/ops_fstype.c
index 4856188c0dfe,7c1014ba7ac7..000000000000
--- a/fs/gfs2/ops_fstype.c
+++ b/fs/gfs2/ops_fstype.c
@@@ -214,28 -226,22 +214,22 @@@ static void gfs2_sb_in(struct gfs2_sbd
static int gfs2_read_super(struct gfs2_sbd *sdp, sector_t sector, int silent)
{
- struct super_block *sb = sdp->sd_vfs;
- struct page *page;
- struct bio_vec bvec;
- struct bio bio;
+ struct gfs2_sb *sb;
int err;
- page = alloc_page(GFP_KERNEL);
- if (unlikely(!page))
+ sb = kmalloc(PAGE_SIZE, GFP_KERNEL);
+ if (unlikely(!sb))
return -ENOMEM;
-
- bio_init(&bio, sb->s_bdev, &bvec, 1, REQ_OP_READ | REQ_META);
- bio.bi_iter.bi_sector = sector * (sb->s_blocksize >> SECTOR_SHIFT);
- __bio_add_page(&bio, page, PAGE_SIZE, 0);
-
- err = submit_bio_wait(&bio);
+ err = bdev_rw_virt(sdp->sd_vfs->s_bdev,
- sector * (sdp->sd_vfs->s_blocksize >> 9), sb, PAGE_SIZE,
- REQ_OP_READ | REQ_META);
++ sector * (sdp->sd_vfs->s_blocksize >> SECTOR_SHIFT),
++ sb, PAGE_SIZE, REQ_OP_READ | REQ_META);
if (err) {
pr_warn("error %d reading superblock\n", err);
- __free_page(page);
+ kfree(sb);
return err;
}
- gfs2_sb_in(sdp, page_address(page));
- __free_page(page);
+ gfs2_sb_in(sdp, sb);
+ kfree(sb);
return gfs2_check_sb(sdp, silent);
}
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-05-08 3:50 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-07-08 3:13 linux-next: manual merge of the block tree with the gfs2 tree Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2025-05-08 3:50 Stephen Rothwell
2020-07-07 2:26 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox