From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Christian Brauner <brauner@kernel•org>
Cc: Chuck Lever <chuck.lever@oracle•com>,
Dai Ngo <dai.ngo@oracle•com>, Jeff Layton <jlayton@kernel•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: build failure after merge of the vfs-brauner tree
Date: Mon, 19 Feb 2024 10:44:50 +1100 [thread overview]
Message-ID: <20240219104450.4d258995@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1621 bytes --]
Hi all,
After merging the vfs-brauner tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:
fs/nfsd/nfs4state.c: In function 'nfsd4_deleg_getattr_conflict':
fs/nfsd/nfs4state.c:8845:32: error: 'struct file_lease' has no member named 'fl_owner'
8845 | dp = fl->fl_owner;
| ^~
Caused by commits
a69ce85ec9af ("filelock: split common fields into struct file_lock_core")
282c30f320ba ("filelock: remove temporary compatibility macros")
interacting with commit
b9b89fb3e0b6 ("NFSD: handle GETATTR conflict with write delegation")
from the nfsd tree.
I have applied the following merge resolution patch.
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Mon, 19 Feb 2024 10:38:26 +1100
Subject: [PATCH] fixup for "filelock: split common fields into struct
file_lock_core"
interacting with "NFSD: handle GETATTR conflict with write delegation"
Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
fs/nfsd/nfs4state.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 3545125c8b73..71bb0ee57cf8 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -8842,7 +8842,7 @@ nfsd4_deleg_getattr_conflict(struct svc_rqst *rqstp, struct inode *inode,
}
break_lease:
nfsd_stats_wdeleg_getattr_inc(nn);
- dp = fl->fl_owner;
+ dp = fl->c.flc_owner;
ncf = &dp->dl_cb_fattr;
nfs4_cb_getattr(&dp->dl_cb_fattr);
spin_unlock(&ctx->flc_lock);
--
2.43.0
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2024-02-18 23:44 UTC|newest]
Thread overview: 114+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-18 23:44 Stephen Rothwell [this message]
2024-03-12 23:41 ` linux-next: build failure after merge of the vfs-brauner tree Stephen Rothwell
2024-03-12 23:45 ` Chuck Lever III
2024-03-13 3:10 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2026-05-18 10:47 Mark Brown
2026-05-18 16:32 ` Mark Brown
2026-05-18 17:06 ` Dorjoy Chowdhury
2026-05-18 17:13 ` Mark Brown
2026-05-18 19:12 ` Jori Koolstra
2026-05-19 16:24 ` Mark Brown
2026-05-21 13:58 ` Jori Koolstra
2026-05-27 12:21 ` Christian Brauner
2026-05-27 13:09 ` Aleksa Sarai
2026-06-03 14:06 ` Jori Koolstra
2026-06-03 14:13 ` Aleksa Sarai
2026-06-03 14:30 ` Jori Koolstra
2026-06-03 14:55 ` Aleksa Sarai
2026-04-09 12:25 Mark Brown
2026-03-25 12:32 Mark Brown
2026-03-26 13:36 ` Christian Brauner
2026-03-27 17:48 ` Mark Brown
2026-03-30 13:17 ` Mark Brown
2026-03-31 9:21 ` Christian Brauner
2026-04-01 10:55 ` Mark Brown
2026-03-13 13:00 Mark Brown
2026-03-23 13:56 ` Mark Brown
2026-03-23 15:37 ` Christian Brauner
2026-03-24 13:28 ` Mark Brown
2026-03-26 13:42 ` Christian Brauner
2026-01-27 11:45 Mark Brown
2026-02-02 14:58 ` Mark Brown
2026-02-04 14:31 ` Mark Brown
2026-02-06 12:19 ` Christian Brauner
2026-02-08 20:55 ` Mark Brown
2026-02-09 1:14 ` Al Viro
2026-01-19 14:30 Mark Brown
2026-01-20 6:55 ` kernel test robot
2026-01-20 8:39 ` kernel test robot
2025-11-16 21:43 Stephen Rothwell
2025-11-16 22:23 ` Jeff Layton
2025-11-17 2:16 ` Stephen Rothwell
2025-11-28 0:04 ` Stephen Rothwell
2025-11-28 9:53 ` Christian Brauner
2025-11-05 22:49 Stephen Rothwell
2025-11-28 10:09 ` Christian Brauner
2025-11-05 0:10 Stephen Rothwell
2025-10-30 21:35 Stephen Rothwell
2025-09-04 1:33 Stephen Rothwell
2025-09-04 7:44 ` schuster.simon
2025-09-08 2:02 ` Stephen Rothwell
2025-09-10 0:49 ` Stephen Rothwell
2025-09-11 12:13 ` Bagas Sanjaya
2025-09-15 6:35 ` schuster.simon
2025-09-15 14:11 ` Christian Brauner
2025-08-31 23:34 Stephen Rothwell
2025-09-01 4:44 ` Onur Özkan
2025-08-17 23:05 Stephen Rothwell
2025-08-19 23:42 ` Stephen Rothwell
2025-08-20 22:54 ` Stephen Rothwell
2025-08-20 23:16 ` Andrew Morton
2025-08-20 23:15 ` Stephen Rothwell
2025-06-18 23:45 Stephen Rothwell
2025-06-19 5:22 ` Lorenzo Stoakes
2025-05-21 10:49 Stephen Rothwell
2025-05-23 10:14 ` Christian Brauner
2025-03-17 23:12 Stephen Rothwell
2025-03-18 15:24 ` Mike Marshall
2025-03-18 15:37 ` Arnd Bergmann
2025-03-18 15:42 ` Mike Marshall
2025-03-17 12:56 Stephen Rothwell
2024-12-11 22:54 Stephen Rothwell
2024-09-02 23:27 Stephen Rothwell
2024-09-03 2:41 ` Aleksa Sarai
2024-09-05 0:58 ` Stephen Rothwell
2024-09-10 0:23 ` Stephen Rothwell
2024-09-10 8:50 ` Christian Brauner
2024-09-10 11:12 ` Stephen Rothwell
2024-09-12 10:23 ` Christian Brauner
2024-09-12 11:24 ` Stephen Rothwell
2024-09-10 14:26 ` Arnaldo Carvalho de Melo
2024-08-19 23:03 Stephen Rothwell
2024-08-06 0:57 Stephen Rothwell
2024-07-26 0:00 Stephen Rothwell
2024-07-29 23:00 ` Stephen Rothwell
2024-07-30 12:12 ` Christian Brauner
2024-06-27 14:08 Mark Brown
2024-04-04 2:24 Stephen Rothwell
2024-04-04 7:50 ` David Howells
2024-02-11 23:52 Stephen Rothwell
2024-02-12 0:36 ` Kent Overstreet
2024-01-23 1:52 Stephen Rothwell
2024-01-24 1:20 ` Stephen Rothwell
2024-01-24 11:13 ` Christian Brauner
2024-01-24 11:35 ` Stephen Rothwell
2024-01-25 16:21 ` Christian Brauner
2023-12-21 0:18 Stephen Rothwell
2023-12-21 1:32 ` Matthew Wilcox
2023-12-21 23:41 ` Stephen Rothwell
2023-10-31 1:07 Stephen Rothwell
2023-10-18 23:54 Stephen Rothwell
2023-10-19 9:17 ` Christian Brauner
2023-10-02 22:30 Stephen Rothwell
2023-10-03 13:24 ` Christian Brauner
2023-09-28 0:54 Stephen Rothwell
2023-10-02 11:21 ` Jan Kara
2023-10-02 11:26 ` Jan Kara
2023-10-02 21:24 ` Stephen Rothwell
2023-10-03 13:27 ` Kent Overstreet
2023-10-04 15:46 ` Jan Kara
2023-10-09 14:00 ` Christian Brauner
2023-09-28 0:39 Stephen Rothwell
2023-09-28 14:52 ` Christian Brauner
2023-08-03 0:03 Stephen Rothwell
2023-08-03 10:06 ` Jan Kara
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=20240219104450.4d258995@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=brauner@kernel$(echo .)org \
--cc=chuck.lever@oracle$(echo .)com \
--cc=dai.ngo@oracle$(echo .)com \
--cc=jlayton@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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