From patchwork Sun Feb 18 23:44:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 202885 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2685:b0:108:e6aa:91d0 with SMTP id mn5csp996282dyc; Sun, 18 Feb 2024 15:45:13 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCVbl4ugVlBRN3lmdwiyZGEZ4G990oJ3EM/VJKWI+bzBMV/QT172Y5YFFUr6FUwhe8PfybYG5jszSTP9FuXYwndCKwoIGQ== X-Google-Smtp-Source: AGHT+IHXo7XBqfwIDtuTsrc5q6H8BJ9xFUtyQR9h1EP4ApERn3qxmQUMN3EckisPoiFYaIZnGvY6 X-Received: by 2002:a17:903:1c9:b0:1db:d42f:fdb9 with SMTP id e9-20020a17090301c900b001dbd42ffdb9mr5529532plh.40.1708299913184; Sun, 18 Feb 2024 15:45:13 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708299913; cv=pass; d=google.com; s=arc-20160816; b=ARz9MHkWX6eGNpqWNM0SdRTE9Eu8WqgLiire5HtbkAu9IRiiwnQkcw7JTnJsSCj9Yw JHL+DsTFFrr+b3Fkl1U0ahOWo/LzL11aLmKcJ6taTtXJK0TWFoHq4o+jonKAfaZTW80l iiCCtVlvfOmtxN8xm0EuiU6qqBkHsz+yyJhvF/B5mF5iYbY8LRAHCdKBM/jvLVDvExrN geggsuJfoeVtKxFRV+2Rb7fW0KaQRxv0XS5+sqey+fwYOf7QBF8Jp2OJCf7bkqTMQCgM 6Hwf2DhYrTx4hlQIFV7Ys4sqIANv1/GnPM8Ax3oFpieoMTqcshr1TjuVh6tppnt3WPC2 LgyQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:list-unsubscribe:list-subscribe:list-id:precedence :message-id:subject:cc:to:from:date:dkim-signature; bh=WFT8QfbCVr4EX+FVsMZB/8KLZUlyEl2vXdvcq9T3a2U=; fh=36HhIchK9LqXA2naSHAY66UkH6Ga1B0yuw81RV4c5jA=; b=v/blr7Z8Q5EkZXj71Su6s/KUPeNWU1C0OxKeH+wcmp1XrIORJdCWMEeiHI28JTe/qR dofWWKavJ5EWveiTrYu0C+Nrb9VzAYYftIEeLxWKjRC1bzphDiQ6BGD+oZR+qATCZPJz hfCdD1CpXupGk0DA0iPg2SNzFll+kkWN/59JsiEieW1W+vcRhciIABe/YT3CLXibh0+h kPGcR6gf7lHzMkYTx9gwugXzbAm6rF+XSnLfMhh21rocZea85SOb6sVnejUvfVR0U8Ft nziW8bsD0Wil8AqWnISCRUBR/TNVBXy7rZbZT0i5kIGztJkzJOOhvTfC0iy3Wui86K7r ESdw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=Ad6yUwTs; arc=pass (i=1 spf=pass spfdomain=canb.auug.org.au dkim=pass dkdomain=canb.auug.org.au dmarc=pass fromdomain=canb.auug.org.au); spf=pass (google.com: domain of linux-kernel+bounces-70624-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-70624-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id e2-20020a170902cf4200b001dbab487a92si3560332plg.116.2024.02.18.15.45.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Feb 2024 15:45:13 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-70624-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=Ad6yUwTs; arc=pass (i=1 spf=pass spfdomain=canb.auug.org.au dkim=pass dkdomain=canb.auug.org.au dmarc=pass fromdomain=canb.auug.org.au); spf=pass (google.com: domain of linux-kernel+bounces-70624-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-70624-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id F35EE2814CA for ; Sun, 18 Feb 2024 23:45:12 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id AAAFC745E8; Sun, 18 Feb 2024 23:45:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="Ad6yUwTs" Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) (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 2AFE4568A; Sun, 18 Feb 2024 23:44:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=150.107.74.76 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708299898; cv=none; b=W2+/8dpm2vOMiG0oUbHyEnwu1wnv/QlbupheHLgAhOPf7PD1x+tPubqJzWzgoluVs+/snmSZAtwUUN/nrif9XcJszQbXTm+rn4Uitn6CHR4sdDBLI79WTNLN87rcdBUf86T1L2BQu/u/9NhFXyajgrYTNUPJiCygGZplXVgNnTA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708299898; c=relaxed/simple; bh=LhCl34C9hj/Y8w39M4PNhKCSJEojxdK1Ro+Y8hrc2Dw=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=ihgLQf1CKq27/a49R5evAD8/Z2dP3oyOZ1b69adFRJu4NcyFc36uCuSCTC+sxWDbfr+SlWXvvgN/74KUZMsPu5g1YSeDUYqMyTExHp9O81XlOpY2IKQimgatOhGChTzTFCx1ASZ5FvAK/QRiHbb5H6zQzIbAXF8598Di2NwSZrQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au; spf=pass smtp.mailfrom=canb.auug.org.au; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b=Ad6yUwTs; arc=none smtp.client-ip=150.107.74.76 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canb.auug.org.au DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1708299892; bh=WFT8QfbCVr4EX+FVsMZB/8KLZUlyEl2vXdvcq9T3a2U=; h=Date:From:To:Cc:Subject:From; b=Ad6yUwTsiYgGVOn7U4f5/phoBJOG+1+j/OwIDdhD2eqBrQdDKsIeW8u/L3GMpH2XX Rz0O0imp0UHz5wnELKXCdsOp4ajcOKTX3vOZ/hVOvF31Q8QzdbWSg+1JGPzj680MHt G3jzFt6D+EFOCHvUuOsAcM4jaq4ZcZXXqy/dz54M9vYkeLaBnNCRWP51P3oCAJf2ES 1h1AZMzR8Lw8+TXz6oaIQvume8W0VaP3yazEOT7fUiVDfHJfO9XnKTYcz7CPqIrA8y XSj+aqVaKGEKTjI/XfdUnZIExywE3z9s7QD/NG1w0hGjSGaLafLT/BP5ORImpwl4oc b6op0e2WH+TJw== Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4TdMj02pbXz4wc7; Mon, 19 Feb 2024 10:44:52 +1100 (AEDT) Date: Mon, 19 Feb 2024 10:44:50 +1100 From: Stephen Rothwell To: Christian Brauner Cc: Chuck Lever , Dai Ngo , Jeff Layton , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: build failure after merge of the vfs-brauner tree Message-ID: <20240219104450.4d258995@canb.auug.org.au> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791282289473863664 X-GMAIL-MSGID: 1791282289473863664 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 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 --- 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);