Received-SPF: pass (google.com: domain of linux-kernel+bounces-56633-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Date: Wed, 7 Feb 2024 09:40:14 -0500
From: Chuck Lever <chuck.lever@oracle.com>
To: Christian Brauner <brauner@kernel.org>, Jeff Layton <jlayton@kernel.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        NeilBrown <neilb@suse.de>
Subject: Re: linux-next: manual merge of the vfs-brauner tree with the nfsd
 tree
Message-ID: <ZcOWTkR+pbQpFwvP@tissot.1015granger.net>
References: <20240207114118.23541d8c@canb.auug.org.au>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20240207114118.23541d8c@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: 
	=?us-ascii?Q?Mpp07OalTFvGo+DCkd3qPWC2Wn0IdJkJMZpJWidZGvWBo5ezB5zjKHrQ1esi?=
 =?us-ascii?Q?7juewEPpMFDz0NoQ4mX5hN9zZCFiazEZRwosxhvWPs1rKBgEzxkFZ+AToP3y?=
 =?us-ascii?Q?pCrOwrcPIawn9l9bOlhC3URpJ74WN0xAg5icaISq5Pt2T2p1WvVUeOK9j8hj?=
 =?us-ascii?Q?wvI1q/1biJpAjMpNgU113uvtypMptfazbpEdQYNdtH4jKgC2xQ8vfwmHNkTJ?=
 =?us-ascii?Q?ddLMV5auDghh4bNkM+RA2x55MN/lI4GMLWF8G7CJnJULkm+IgWoaRUk5GBQ6?=
 =?us-ascii?Q?Xk5vVJwKD2WyXZY+EN7xyrurGRzZeYNdAvFxcA10ffBzuhRHS3mucAvAvXf+?=
 =?us-ascii?Q?+4Z7EcY1serlYgsVlJaEfmx8/6m/RVwEypULOwCNLymiNvrX0dAh7I3UCfeJ?=
 =?us-ascii?Q?Z5SzN8O8nrKM37zlv9JaZYYJ5EkL4DXFKMOQfNQ/LtPXCqHl10Kq3SC057rL?=
 =?us-ascii?Q?J8QcvXaTpcty2d3y98iIYW0ODWzNuJTPpIP7o8xakcVLUX0fnZJSKGSLRO4n?=
 =?us-ascii?Q?MWnmuzI18/Msim9jUeN4iI0qok5mUNMebzg//K770cxDrXCGBTxf9gjCOiSP?=
 =?us-ascii?Q?oYuT67wxw1FRoolDn2bu8YIL5P2wD4ZrQdSH506vFKVaKelQKICE5mWDQ1ZQ?=
 =?us-ascii?Q?4CGzUFh9anqX0KY1+ze7h0NuSeYp35s8gXkWxunUOLBJtBHJsTlKcm8tXGgk?=
 =?us-ascii?Q?S+kA2JU/+2IsfiAINf0h9q+rbb66sN3yYuki//kh7cLCpJYH7dPG8rM5zYmn?=
 =?us-ascii?Q?HaTqxI9eg6lFqsq6Tk3v4uFXrY3n87l6qyjiGFDCUtOxujk2liQM2M9AMtXF?=
 =?us-ascii?Q?8iOL/+JrlZsFZa9SwhoViJPOUetKD43FemslafbgwHldmX0xs3M+wIsFtgMh?=
 =?us-ascii?Q?xKyKcRPyTqLo/QWow1Bg/Jb4mw5mwmGqql30YwCxcSzpZa/3VJfMQWFO1hWH?=
 =?us-ascii?Q?b9k4F9tLjq0pB467AsQF+XQrApKBdnffH+6Q8QSx5TbAfrggUmY/zJrowE9D?=
 =?us-ascii?Q?7hOEmME+hzkMmrurxjAqhqx4HDjtO9FbbewSusYnt+kalQw43qXwnhRNH5Je?=
 =?us-ascii?Q?d38IIwHjyFcnQl3PTmPP/T1+hbGREXyMg72/KuKiIRqyhQa7ALUmcXfIVznm?=
 =?us-ascii?Q?1Kzqg1eAstUJgWvTLsLTPyLOb3f4fxU4RNIOT9LtWSDt71+M4Q07G8tw65ow?=
 =?us-ascii?Q?Y2jObbfIpcXva2C/12Be78uqn1xu2rRaaQ7w4rJZDiKCDmZIUd8KzvK9FQ+J?=
 =?us-ascii?Q?HaMjrvMxoJfLD4FBHQKmpSZBC6+A09f5KJsBrZgF0njaRHrFgxRIw79Z6Edg?=
 =?us-ascii?Q?YiigAGXeGDJzLDwUHQwnQYMklA+TEz1m6LArt2Ra0qLI5sOSyhEOXktaOOO2?=
 =?us-ascii?Q?9v/PSZmzBdK6pEs8KwQ5JDWOp37k5+AkMv1JKYgrkL6iciKYZQtD8QsKVIHy?=
 =?us-ascii?Q?RZDOuV08mhLqE9s4DHrq9g+Agan/6KtF6MvKdf9QK4D/0ItDfos4zHVxeTOG?=
 =?us-ascii?Q?cAfRX73Wp2Nbea1BXCEgs5DKCuly8aJ1v/68P63acXhAlj22XO4UvVhDOxCf?=
 =?us-ascii?Q?OeHmT/lazfczaP46zO2L3hioFM1jpt9yY7J+0fiSJol+qXDLRot+YOhe1Vam?=
 =?us-ascii?Q?Xw=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 
	/iYGsZnD2RN6FtiIElwszXxun9BunzvXTdy8+5MkKh8zUe0ArEn/2j0Jekyk8lIZ0ACMQt/sUmPMcobzpyo1UBdJYLEnHy8PFzpgrytZzhOIEcyLeqWZFmWjj+wdWXiZR71o8uLHzJCsj1eDkjw7DcWVvgjFATgpJreNdyIa4cztwUjwDsKPpkrMO9tAlXETWeIgMC+/Idpv8HIfwVoI3SaehiWqjaJ4Lpu4I/Ji4kkqRKcylfTmUsvjhZduG0IQISyn1Sx6kFjX1UwHx7kSJClHvVphA8OrjNAY7jJT914hxC4ovlCVdy2pF/HoqZDONHMOqqV/XdfbTm+vB7UA4SkVV2jx3zQcWneEijc1dljbHgqPuaGR+CCKuKVMKXMyXG3N5vXDOR/441jJ5RGOBPTez0LcouFlRaA/KHPDxPdHHTfhKrYhx4WJf831XGKQWwHs7ylpktrKHaHzFkSEMORBeL10CC2m19mKt3kPZlX9otiTkXnVowAPTnrarkImItZl0FBdjSAJuGsStDsqvyU9Gxwgse/+0C5ya8kOAVEfIXXAhXZE4hxluDcjfn5JvcZBqUeodylqrXEJTJnVqv71mct4hWSdONrwUfFqFMc=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: a7fea709-858e-43f0-e7d5-08dc27eab3ee
X-MS-Exchange-CrossTenant-AuthSource: BN0PR10MB5128.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Feb 2024 14:40:17.5796
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: zPEe/CWICwlq+AFtuwHtvZfA3Gz+9RbzYL0zZH91BQNRTYMxe7K2OEylCmjN5NYHvTrpKAQFJB+c1EkLO8xspA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR10MB7338
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26
 definitions=2024-02-07_05,2024-01-31_01,2023-05-22_02
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 bulkscore=0
 mlxlogscore=999 suspectscore=0 adultscore=0 spamscore=0 malwarescore=0
 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2311290000 definitions=main-2402070109
X-Proofpoint-GUID: 2Hly1gjroMQ2L0en_8piuWMSYntnwjON
X-Proofpoint-ORIG-GUID: 2Hly1gjroMQ2L0en_8piuWMSYntnwjON

On Wed, Feb 07, 2024 at 11:41:18AM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the vfs-brauner tree got a conflict in:
> 
>   fs/nfsd/nfs4layouts.c
> 
> between commit:
> 
>   b1f1961080c4 ("nfsd: allow layout state to be admin-revoked.")
> 
> from the nfsd tree and commit:
> 
>   7b8001013d72 ("filelock: don't do security checks on nfsd setlease calls")
> 
> from the vfs-brauner tree.

Christian, Jeff -

For the remaining duration of v6.9 development, should I rebase
nfsd-next on vfs-brauner ?


> 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/nfsd/nfs4layouts.c
> index b1e585c1d9a3,4c0d00bdfbb1..4f3072b5979a
> --- a/fs/nfsd/nfs4layouts.c
> +++ b/fs/nfsd/nfs4layouts.c
> @@@ -152,23 -152,6 +152,23 @@@ void nfsd4_setup_layout_type(struct svc
>   #endif
>   }
>   
>  +void nfsd4_close_layout(struct nfs4_layout_stateid *ls)
>  +{
>  +	struct nfsd_file *fl;
>  +
>  +	spin_lock(&ls->ls_stid.sc_file->fi_lock);
>  +	fl = ls->ls_file;
>  +	ls->ls_file = NULL;
>  +	spin_unlock(&ls->ls_stid.sc_file->fi_lock);
>  +
>  +	if (fl) {
>  +		if (!nfsd4_layout_ops[ls->ls_layout_type]->disable_recalls)
> - 			vfs_setlease(fl->nf_file, F_UNLCK, NULL,
> - 				     (void **)&ls);
> ++			kernel_setlease(fl->nf_file, F_UNLCK, NULL,
> ++					(void **)&ls);
>  +		nfsd_file_put(fl);
>  +	}
>  +}
>  +
>   static void
>   nfsd4_free_layout_stateid(struct nfs4_stid *stid)
>   {


-- 
Chuck Lever