Re: linux-next: build failure after merge of the vfs-brauner tree

[Chuck Lever III]

> On Mar 12, 2024, at 7:41 PM, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> 
> Hi all,
> 
> On Mon, 19 Feb 2024 10:44:50 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>> 
>> 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@xxxxxxxxxxxxxxxx>
>> 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@xxxxxxxxxxxxxxxx>
>> ---
>> 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
> 
> This is now required in the merge of the nfsd tree with Linus' tree.

Sorry, I thought Linus was going to address this when he merged
nfsd-next today. What's the preferred resolution?


--
Chuck Lever