From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E81E2C4320A for ; Tue, 24 Aug 2021 00:07:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C316C61214 for ; Tue, 24 Aug 2021 00:07:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233363AbhHXAIZ (ORCPT ); Mon, 23 Aug 2021 20:08:25 -0400 Received: from bilbo.ozlabs.org ([203.11.71.1]:58785 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233260AbhHXAIY (ORCPT ); Mon, 23 Aug 2021 20:08:24 -0400 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 ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4GtqDp62THz9sXV; Tue, 24 Aug 2021 10:07:38 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1629763659; bh=gBHbL1jLvzywBmlq970c89meGcxBD6vc6e4gIiN0SAg=; h=Date:From:To:Cc:Subject:From; b=mwqM9vbzE6UDsPqTeM5badgJfLBaXiLvIJF8S0W4La5AVztQvZ48QKwH/+nkqqB8a 8q3huCNj7QKMhQfY9AyyoykLlK4ksFvpI6kvKovlEUYWc5EQk8x3trY9yNJUUyKk+9 Ekm9DAYpXkS8NO3UkXR+A04P0hcmvk6/LA6HY7zxdG89nceMfl77Cu41/0neGhsjdx 9JAeBfn0TysahNTdaXbLRgX5K4VTnKnIJYEYBz0AZhWkDuNoY5knjMuF/PVpg9wYFi c1AoQDzZmR+au2l470skcKkoh9y4Jlyr8jzXXxQ5IofLtvQFwF+qgAKgx/tGmD9+yM Jm2VrdpQwhf5A== Date: Tue, 24 Aug 2021 10:07:37 +1000 From: Stephen Rothwell To: Jeff Layton , Chuck Lever Cc: "J. Bruce Fields" , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the file-locks tree with the cel tree Message-ID: <20210824100737.4bd6d815@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/8/NlOoMWk5HiqmmcC9Xr98g"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/8/NlOoMWk5HiqmmcC9Xr98g Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the file-locks tree got a conflict in: fs/nfs/file.c between commit: c045f1c40a48 ("nfs: don't allow reexport reclaims") from the cel tree and commit: f7e33bdbd6d1 ("fs: remove mandatory file locking support") from the file-locks 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. --=20 Cheers, Stephen Rothwell diff --cc fs/nfs/file.c index 7411658f8b05,514be5d28d70..000000000000 --- a/fs/nfs/file.c +++ b/fs/nfs/file.c @@@ -806,13 -806,6 +806,9 @@@ int nfs_lock(struct file *filp, int cmd =20 nfs_inc_stats(inode, NFSIOS_VFSLOCK); =20 + if (fl->fl_flags & FL_RECLAIM) + return -ENOGRACE; + - /* No mandatory locks over NFS */ - if (__mandatory_lock(inode) && fl->fl_type !=3D F_UNLCK) - goto out_err; -=20 if (NFS_SERVER(inode)->flags & NFS_MOUNT_LOCAL_FCNTL) is_local =3D 1; =20 --Sig_/8/NlOoMWk5HiqmmcC9Xr98g Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmEkOEoACgkQAVBC80lX 0GwAEwf/evAG/xXRXo59g1drpfK9QzvRF/IIMdnjB+TPJfA78KmPJAhEjTB7DOAM m7sw1GJqYS1Zv+t/Aw+Oi7maJaZ/oJxbp0Txl0uoFxQMpUmBQXaVZeqsbJOMbNi9 xHPDWyEkRabf/wV3rW42ROt2yXjC7Kin85+E3J9Z/fTwvy5EHQgsZ3haNOU1CJ0q rKvo3RJLqnesCWJcrALN6VXztCMPqloAkuw1Ptl9ad7eZlPAAK2PbHeNvR44JmPi a9q6GKiPL01HdXcHn5cKquIppJAcXbAVrux7VvSZFwgMq8QXJYpldnkvL8+OwYiv ZnCY5wfJIy+Aw9BOBC2nNpRntMYT5Q== =MQMC -----END PGP SIGNATURE----- --Sig_/8/NlOoMWk5HiqmmcC9Xr98g--