Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Chuck Lever III <chuck.lever@oracle.com>
To:     Jeff Layton <jlayton@kernel.org>
CC:     Neil Brown <neilb@suse.de>,
        Linux NFS Mailing List <linux-nfs@vger.kernel.org>
Subject: Re: [RFC PATCH 2/3] nfsd: rework arguments to nfs4_set_delegation
Thread-Topic: [RFC PATCH 2/3] nfsd: rework arguments to nfs4_set_delegation
Thread-Index: AQHYl5ZdeROx4s5Ma02JTduV4JOwj61+E5GAgAAG9ACAAADHgA==
Date:   Thu, 14 Jul 2022 17:14:55 +0000
Message-ID: <E8CCB7EF-242C-4530-96E2-ACC7B5CB3163@oracle.com>
References: <20220714152819.128276-1-jlayton@kernel.org>
 <20220714152819.128276-3-jlayton@kernel.org>
 <CDD9B96C-3CFC-4BA5-A71C-6C2BFAC2B227@oracle.com>
 <476892362c94debad589af79ff7d6766f5ca8c85.camel@kernel.org>
In-Reply-To: <476892362c94debad589af79ff7d6766f5ca8c85.camel@kernel.org>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?O0eifyy7IIDsUWalpt2hn5jMMgBoexXg3cmibrXHtgVPUuM5X7Fb9+tz6KkK?=
 =?us-ascii?Q?fTa5/r73LLEabEylWYDdjcOKWKD4Ko24dkxA8TVz8jfkEXLRq7G1oZ3xQnpS?=
 =?us-ascii?Q?Xj3YZWwJDsa+YKxrcpF+xbhbhTySkI7yJMeI6Qb3WCyoUyPUc2hSVkAe1QEM?=
 =?us-ascii?Q?Hun9CsQ6rbMT3oE/FOdVw7dkNdXJnKgoV/X9tnkakXO/EHfRDlKZJhX4Z3jH?=
 =?us-ascii?Q?ot71Bdr+9lTYMJoWQgiD3zAYtNGvsMSBmwTPB6AQ53Fi52mK9EPuL6FtHV/C?=
 =?us-ascii?Q?RGdho38QXu74OX/BI9WlI9HCm2kpxWlHT/MlA8ATWCnYBrTFRORvckogRaX8?=
 =?us-ascii?Q?0uGPMZ8dOckJn3DEUi2Hv+j5mS37IGqRV0JNXM2wFlNDbym0rm3JNwfIPTXh?=
 =?us-ascii?Q?/U0IqhX39W+yj4kTS8cEH9V4krJO3P57TLevvK7RBzgB75d97MIWfYLgCUqD?=
 =?us-ascii?Q?S9yPieaL/zpJ4RKBWkox9fKMC37fj8jmwlSUs+ZynPDS3amZThQebM1+G293?=
 =?us-ascii?Q?vwxPoqktcuzECU7fvjeYwJJYs65/snrD6m1Gh7Jxvt6iTkOgrnt2oTtiwPLH?=
 =?us-ascii?Q?8Sd+9T4hpHWRnC73wh9C0icrw9DIK5SbRUtAGIYzmWJsF/uvg3qh+8b5f+/k?=
 =?us-ascii?Q?rCustUn8Vi3jTvXAaZFwr5wbk0RTCHlyctEFUfM0Hme9P1CimeW/sdduY4VE?=
 =?us-ascii?Q?0aTzOrgNi/Jyjs2Q3o/vLBZsGMZmbfkJkFrPKUeD4p8mazpwbznH4VHzajWp?=
 =?us-ascii?Q?o1Wa6p5PgMynq86+RltNd0S+ze0/tEoji5FDG7KqO8DZKsy7FUnkdcMfTxGl?=
 =?us-ascii?Q?qqMbLTPSgTuLSVJVgpwqxgyqTE4ktwGhpUXgF5AMZyLK5dEaZWIuPeiy/646?=
 =?us-ascii?Q?QBbDSl5lCfwGAwzuYRPp3R7yH7gg98kV9D5qwEEFub//x+Lc8WP1j0skK0bn?=
 =?us-ascii?Q?OGyoD0fd23FdDWknIpUPEyoOewW47VYqsKy0Br32Q+AIqmZ3+lpqHNLQ+v0y?=
 =?us-ascii?Q?xMi5IrbVDX7ircrxq7bBeIldLhjO9jNIHogBIpYqpl4BnJKbzG88Aj/bWSCU?=
 =?us-ascii?Q?+xrqOJ96aF2BgAnx+/uInoAotPW7Rq/dxbf09yj54d9UUx4ZbN+CilXIOYDR?=
 =?us-ascii?Q?VcRlLNejR2ZmWGji2BenPl/BjECm8XXMVhkpSixePVIqDT/Zb6yR7scbLfwd?=
 =?us-ascii?Q?opCkFYjmJataHEKkJKcUC1hCL+X1x6OiW3POBwRC2ubbHmoH3GQXyL3XYyWc?=
 =?us-ascii?Q?yXdBUtjQ7nfT7vkpfsUTDijWH5IlGMT1SsWTsSmwZJzBd0peHJpngdlb0o1r?=
 =?us-ascii?Q?vj5+i3h5bM6t1jWNKm7cEUHkI9WeQ6672/c1TpPFUpC/E85LgTE1BNksxQWA?=
 =?us-ascii?Q?0DqXPNhrBkeOGsCkyY911Frd+CbFK+DCy9imKHq0yKq1zLuw7LUGQ1QNae4Z?=
 =?us-ascii?Q?lqGwT0qntwBMbbzxBpYIv4hSt5b/VJrH7QHpPAy0/1RON40A+AuAP5UGpNbo?=
 =?us-ascii?Q?1BYSkK3CNYLBrjKD/xt49sVOEN9D2qIyNkMwezMo8pbcMt7pyoWn5/Hc3/jB?=
 =?us-ascii?Q?WuxkI3n7TOhjhatj5pvNxqERPfBJwFVFz2w8yHJ7MWNRJiVLNqmBcWxwWjgM?=
 =?us-ascii?Q?Ew=3D=3D?=
Content-Type: text/plain; charset="us-ascii"
Content-ID: <68B15DCDA23EAC4082FEE717C5BF04E5@namprd10.prod.outlook.com>
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: BN0PR10MB5128.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 1a8dea1d-de2c-4799-5921-08da65bc5f9e
X-MS-Exchange-CrossTenant-originalarrivaltime: 14 Jul 2022 17:14:55.8504
 (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: tZ8xiHa1GvD8vURMrcVxKlnbd5W0jwK4xpM64hMR2qaKkZ/t2Se7fFZ81OtixY9+uSbrz0zpMEC/48BWv1A2jQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR10MB4483
X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.517,18.0.883
 definitions=2022-07-14_14:2022-07-14,2022-07-14 signatures=0
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 mlxlogscore=999
 malwarescore=0 suspectscore=0 mlxscore=0 spamscore=0 adultscore=0
 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2206140000 definitions=main-2207140075
X-Proofpoint-ORIG-GUID: WtDweXI3Yo9mDTWKKsCnPpR6jfJtLB9g
X-Proofpoint-GUID: WtDweXI3Yo9mDTWKKsCnPpR6jfJtLB9g
X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,
        RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-nfs.vger.kernel.org>
X-Mailing-List: linux-nfs@vger.kernel.org

=20

> On Jul 14, 2022, at 1:12 PM, Jeff Layton <jlayton@kernel.org> wrote:
>=20
> On Thu, 2022-07-14 at 16:47 +0000, Chuck Lever III wrote:
>>=20
>>> On Jul 14, 2022, at 11:28 AM, Jeff Layton <jlayton@kernel.org> wrote:
>>>=20
>>> We'll need the nfs4_open to vet the filename. Change nfs4_set_delegatio=
n
>>> to take the same arguments are nfs4_open_delegation.
>>=20
>> ^are^as
>>=20
>> Nit: Considering that in the next patch you change the synopsis of
>> nfs4_open_delegation again but not nfs4_set_delegation, this
>> description causes a little whiplash.
>>=20
>>=20
>=20
> Yeah, I should have squashed a couple of those together. I _did_ say it
> was an RFC. I can resend a cleaned-up version later if you want to take
> this in.

I'm interested in Neil's thoughts about this approach, but I'm
willing to run with it unless test results show a regression.


>>> Signed-off-by: Jeff Layton <jlayton@kernel.org>
>>> ---
>>> fs/nfsd/nfs4state.c | 8 +++++---
>>> 1 file changed, 5 insertions(+), 3 deletions(-)
>>>=20
>>> diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
>>> index 4f81c0bbd27b..347794028c98 100644
>>> --- a/fs/nfsd/nfs4state.c
>>> +++ b/fs/nfsd/nfs4state.c
>>> @@ -5260,10 +5260,12 @@ static int nfsd4_check_conflicting_opens(struct=
 nfs4_client *clp,
>>> }
>>>=20
>>> static struct nfs4_delegation *
>>> -nfs4_set_delegation(struct nfs4_client *clp,
>>> -		 struct nfs4_file *fp, struct nfs4_clnt_odstate *odstate)
>>> +nfs4_set_delegation(struct nfsd4_open *open, struct nfs4_ol_stateid *s=
tp)
>>> {
>>> 	int status =3D 0;
>>> +	struct nfs4_client *clp =3D stp->st_stid.sc_client;
>>> +	struct nfs4_file *fp =3D stp->st_stid.sc_file;
>>> +	struct nfs4_clnt_odstate *odstate =3D stp->st_clnt_odstate;
>>> 	struct nfs4_delegation *dp;
>>> 	struct nfsd_file *nf;
>>> 	struct file_lock *fl;
>>> @@ -5405,7 +5407,7 @@ nfs4_open_delegation(struct nfsd4_open *open, str=
uct nfs4_ol_stateid *stp)
>>> 		default:
>>> 			goto out_no_deleg;
>>> 	}
>>> -	dp =3D nfs4_set_delegation(clp, stp->st_stid.sc_file, stp->st_clnt_od=
state);
>>> +	dp =3D nfs4_set_delegation(open, stp);
>>> 	if (IS_ERR(dp))
>>> 		goto out_no_deleg;
>>>=20
>>> --=20
>>> 2.36.1
>>>=20
>>=20
>> --
>> Chuck Lever
>>=20
>>=20
>>=20
>=20
> --=20
> Jeff Layton <jlayton@kernel.org>

--
Chuck Lever