Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Chuck Lever III <chuck.lever@oracle.com>
To:     Neil Brown <neilb@suse.de>
CC:     Linux NFS Mailing List <linux-nfs@vger.kernel.org>
Subject: Re: [PATCH v1 2/2] SUNRPC: Remove svo_shutdown method
Thread-Topic: [PATCH v1 2/2] SUNRPC: Remove svo_shutdown method
Thread-Index: AQHYEh4AiHVQD0aNRUipeoAjiSRA4qx0R9qAgAABnIA=
Date:   Tue, 25 Jan 2022 21:59:39 +0000
Message-ID: <E1C5753E-6061-41CC-930F-1565488FC799@oracle.com>
References: <164313706374.3285.4265550102084857832.stgit@bazille.1015granger.net>
 <164313725230.3285.5420060785593218794.stgit@bazille.1015granger.net>
 <164314763348.5493.760625882164316264@noble.neil.brown.name>
In-Reply-To: <164314763348.5493.760625882164316264@noble.neil.brown.name>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?Yr5Si8b8zgJQFu/7utGamJJJKSFFT2XcZ738z4VrIw/jmPhWD+NjuVY7ZQ7R?=
 =?us-ascii?Q?+vHpyuKdLSaTpUNQ0cwy78l1IVaIoYE8xZpSti7W3p5BZS8xIHlRE6ZQI+4j?=
 =?us-ascii?Q?wWSTMPICALEiyQ0T6t9u9JlWL9anQ2CAs7jb6mBdyO6lAHSGSpbjPbtHqW+h?=
 =?us-ascii?Q?xxrPK3q993bnkm6+8UF5PeZVPfC3zm8wo7JPNRIB25L3BU7n76QzX676dEk7?=
 =?us-ascii?Q?IbQAIDpYzMP5jAwoRajDvAfNzex/B1cSfWOzWin3qxadEaDc4jZ+kWp9xMlh?=
 =?us-ascii?Q?mmbZUDiIz8noVXCDLicTWUq+cDvVYuuN1StAYtP74lifQWk/o1WJ1VfoLtM0?=
 =?us-ascii?Q?nUK0ODa0Rv/JT2yxJlKU1haczxht6EKBLXnr8yfXULoyY8x3fYHp+PagVJNh?=
 =?us-ascii?Q?etfx/+BeS8/cMHQXuiqWsHwKfErKw3ksTf4mMDKFmcJiLKE7Ta+ozWMkNZcU?=
 =?us-ascii?Q?DXymYig+45qeJl4LIv90Zqzgj5jgt9ltT2wXq5a2FRh5ZcPN2udfAkwti0k5?=
 =?us-ascii?Q?Opi/KlRUU4SsZEWcKM8KBuVYV4PSByYvURandLpRnPYMQ+5m3f6OLFu0LujW?=
 =?us-ascii?Q?CuTWLG/UcQ36WUzRM0UaI9DVxqhqHp4fpJoGQu+9XObdZ936mnTut30qtCJ5?=
 =?us-ascii?Q?9kKGqv3J+TpFYKq69leVqZLueh7W3k7E+pwzO7j4R3YwvcFa68BNTdip3Ou1?=
 =?us-ascii?Q?jLpyzKRB4YjV7JCF/Yyb6g8xHYePP8eazSnMq6n4rmA7bRJz3oVaV2FtSko6?=
 =?us-ascii?Q?eVLh1vaZZVHLRPthZMAOsYkmb45fvzPOs9rI49U463hyaAqTcJHRoOHC+phX?=
 =?us-ascii?Q?d0sC7UsFMekLlRzG/+N2ZhPEh+GBedCwkuQeilAtZGR125CjgVeD8a9K8Ecq?=
 =?us-ascii?Q?fKPHl09qq17Cn83Gxmb961e5NYQA0Uv7F1FBEg04q8cyS8dcm6PFGAwuOSPq?=
 =?us-ascii?Q?Xd+Q2HiuhdU27mUgFiIg+iYBl1VPk1VeT0Bu32VfiRelIYgH4l17fWjXonYO?=
 =?us-ascii?Q?M8vNST9IGs3uTQiU8tEadOykKoP3wY9bfdBOVMLY9Rkkmf1ckj01YBbVgqrA?=
 =?us-ascii?Q?yfjfFNCm+U5V9JCpbj++jIfPerGyoUyuUZTTWiT6T3P6ZQiJ59t23bybWMur?=
 =?us-ascii?Q?GB5ytG/ybASJRx5/sMRvSqBnltIHoJKyaV16JFy3buEUf/cS8sJnG0A0JGJC?=
 =?us-ascii?Q?r+sYDfJNejuGWy7n5/KYLkdJsR549bGgbm+om7J+ljhXTKW+/dg3o/+CfeJM?=
 =?us-ascii?Q?Lum2hLcBazh0pwFNjG02LOwtiYPXW1mV5mr8dBoufqeGsy8Ilj1pppjLzWY+?=
 =?us-ascii?Q?SHHNe4AK5D+zPvL+adUZ6zmqWFFaUzc198D4uXiDPbnQmyyGZEerVqWJodhl?=
 =?us-ascii?Q?SSJ6LfxSYBxzX5ljiomyNCU2oaUJPzKkJ91tCyfBIaJNnwQNW2FOlSr7/Qfd?=
 =?us-ascii?Q?x77TjVTLbKJ73FZ9vY24fLAkB14UbKSN9yjQmT5Z/C2SumtwLNEYyQ1XP5Br?=
 =?us-ascii?Q?IbJRXedygnnjVbqY7Lb8nJKME0V18j+BEuorz0sX0B+tsdXEzgRpGTSmeGQ5?=
 =?us-ascii?Q?uT//rW5UmNsw8D+BqOks0mNZ5tx7q7ItgyoSu9+hcxLoJBKF+Avww6clO33P?=
 =?us-ascii?Q?JbZNHpjFF9nvrLuLVEp4De0=3D?=
Content-Type: text/plain; charset="us-ascii"
Content-ID: <62CA8DC7994FDE4BAAF4C992A8A581A3@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: CH0PR10MB4858.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: ce6db024-9f6b-4152-ed1b-08d9e04dfc30
X-MS-Exchange-CrossTenant-originalarrivaltime: 25 Jan 2022 21:59:39.6866
 (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: lTMlBdc/f/r95t02bjk8hQZISNoK+mtP3AsfXLuYH7msrcaWDgeIqNYF9iNlw0Qb82ICHza3UlhGzBTUap97gA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR10MB1989
X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10238 signatures=668683
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 mlxlogscore=999
 adultscore=0 spamscore=0 bulkscore=0 mlxscore=0 phishscore=0
 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2201110000 definitions=main-2201250131
X-Proofpoint-GUID: zrWwi7wD542qdZwEMe7vxc5RDhvRY0qX
X-Proofpoint-ORIG-GUID: zrWwi7wD542qdZwEMe7vxc5RDhvRY0qX
Precedence: bulk
List-ID: <linux-nfs.vger.kernel.org>
X-Mailing-List: linux-nfs@vger.kernel.org


> On Jan 25, 2022, at 4:53 PM, NeilBrown <neilb@suse.de> wrote:
>=20
> On Wed, 26 Jan 2022, Chuck Lever wrote:
>> Clean up. Neil observed that "any code that calls svc_shutdown_net()
>> knows what the shutdown function should be, and so can call it
>> directly."
>>=20
>> Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
>> ---
>> fs/lockd/svc.c             |    5 ++---
>> fs/nfsd/nfssvc.c           |    2 +-
>> include/linux/sunrpc/svc.h |    3 ---
>> net/sunrpc/svc.c           |    3 ---
>> 4 files changed, 3 insertions(+), 10 deletions(-)
>>=20
>> diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c
>> index 3a05af873625..f5b688a844aa 100644
>> --- a/fs/lockd/svc.c
>> +++ b/fs/lockd/svc.c
>> @@ -249,6 +249,7 @@ static int make_socks(struct svc_serv *serv, struct =
net *net,
>> 		printk(KERN_WARNING
>> 			"lockd_up: makesock failed, error=3D%d\n", err);
>> 	svc_shutdown_net(serv, net);
>> +	svc_rpcb_cleanup(serv, net);
>> 	return err;
>> }
>>=20
>> @@ -287,8 +288,7 @@ static void lockd_down_net(struct svc_serv *serv, st=
ruct net *net)
>> 			cancel_delayed_work_sync(&ln->grace_period_end);
>> 			locks_end_grace(&ln->lockd_manager);
>> 			svc_shutdown_net(serv, net);
>> -			dprintk("%s: per-net data destroyed; net=3D%x\n",
>> -				__func__, net->ns.inum);
>> +			svc_rpcb_cleanup(serv, net);
>> 		}
>> 	} else {
>> 		pr_err("%s: no users! net=3D%x\n",
>> @@ -351,7 +351,6 @@ static struct notifier_block lockd_inet6addr_notifie=
r =3D {
>> #endif
>>=20
>> static const struct svc_serv_ops lockd_sv_ops =3D {
>> -	.svo_shutdown		=3D svc_rpcb_cleanup,
>> 	.svo_function		=3D lockd,
>> 	.svo_module		=3D THIS_MODULE,
>> };
>> diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c
>> index aeeac6de1f0a..0c6b216e439e 100644
>> --- a/fs/nfsd/nfssvc.c
>> +++ b/fs/nfsd/nfssvc.c
>> @@ -613,7 +613,6 @@ static int nfsd_get_default_max_blksize(void)
>> }
>>=20
>> static const struct svc_serv_ops nfsd_thread_sv_ops =3D {
>> -	.svo_shutdown		=3D nfsd_last_thread,
>> 	.svo_function		=3D nfsd,
>> 	.svo_module		=3D THIS_MODULE,
>> };
>> @@ -724,6 +723,7 @@ void nfsd_put(struct net *net)
>>=20
>> 	if (kref_put(&nn->nfsd_serv->sv_refcnt, nfsd_noop)) {
>> 		svc_shutdown_net(nn->nfsd_serv, net);
>> +		nfsd_last_thread(nn->nfsd_serv, net);
>> 		svc_destroy(&nn->nfsd_serv->sv_refcnt);
>> 		spin_lock(&nfsd_notifier_lock);
>> 		nn->nfsd_serv =3D NULL;
>> diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h
>> index 6ef9c1cafd0b..63794d772eb3 100644
>> --- a/include/linux/sunrpc/svc.h
>> +++ b/include/linux/sunrpc/svc.h
>> @@ -55,9 +55,6 @@ struct svc_pool {
>> struct svc_serv;
>>=20
>> struct svc_serv_ops {
>> -	/* Callback to use when last thread exits. */
>> -	void		(*svo_shutdown)(struct svc_serv *, struct net *);
>> -
>> 	/* function for service threads to run */
>> 	int		(*svo_function)(void *);
>>=20
>> diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c
>> index 2aabec2b4bec..74a75a22da9a 100644
>> --- a/net/sunrpc/svc.c
>> +++ b/net/sunrpc/svc.c
>> @@ -539,9 +539,6 @@ EXPORT_SYMBOL_GPL(svc_create_pooled);
>> void svc_shutdown_net(struct svc_serv *serv, struct net *net)
>> {
>> 	svc_close_net(serv, net);
>> -
>> -	if (serv->sv_ops->svo_shutdown)
>> -		serv->sv_ops->svo_shutdown(serv, net);
>> }
>> EXPORT_SYMBOL_GPL(svc_shutdown_net);
>=20
> Could we rename svc_close_net() to svc_shutdown_net() and drop this
> function?

I considered that, but svc_close_net() seems to be transport-related,
whereas svc_shutdown_net() seems to be generic to the NFS server, so
I left them separate. A better rationale might push me into merging
them. :-)


> Either way:=20
>  Reviewed-by: NeilBrown <neilb@suse.de>
>=20
> Thanks,
> NeilBrown

--
Chuck Lever