[PATCH RFC 1/5] NFS: name the init_nfs_fs() error labels
From: Chuck Lever <cel@kernel.org>
Date: 2026-09-18 14:05:34
Also in:
keyrings, linux-doc, linux-nfs
Subsystem:
filesystems (vfs and infrastructure), nfs, sunrpc, and lockd clients, the rest · Maintainers:
Alexander Viro, Christian Brauner, Trond Myklebust, Anna Schumaker, Linus Torvalds
The unwind labels in init_nfs_fs() are numbered, and the numbering already skips out8, so a reader has to count the label block to learn what each one undoes. Inserting an init step means either renumbering every label below it or leaving the sequence out of order, and a goto that picks the wrong number unwinds the wrong step. Name each label for the step it undoes, as coding-style.rst asks. Signed-off-by: Chuck Lever <cel@kernel.org> --- fs/nfs/inode.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-)
diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
index 3022454f7698..832923be43a9 100644
--- a/fs/nfs/inode.c
+++ b/fs/nfs/inode.c@@ -2722,64 +2722,64 @@ static int __init init_nfs_fs(void) err = nfs_sysfs_init(); if (err < 0) - goto out10; + goto err_keyring; err = register_pernet_subsys(&nfs_net_ops); if (err < 0) - goto out9; + goto err_sysfs; err = nfsiod_start(); if (err) - goto out7; + goto err_pernet; err = nfs_fs_proc_init(); if (err) - goto out6; + goto err_nfsiod; err = nfs_init_nfspagecache(); if (err) - goto out5; + goto err_proc; err = nfs_init_inodecache(); if (err) - goto out4; + goto err_nfspagecache; err = nfs_init_readpagecache(); if (err) - goto out3; + goto err_inodecache; err = nfs_init_writepagecache(); if (err) - goto out2; + goto err_readpagecache; err = nfs_init_directcache(); if (err) - goto out1; + goto err_writepagecache; err = register_nfs_fs(); if (err) - goto out0; + goto err_directcache; return 0; -out0: +err_directcache: nfs_destroy_directcache(); -out1: +err_writepagecache: nfs_destroy_writepagecache(); -out2: +err_readpagecache: nfs_destroy_readpagecache(); -out3: +err_inodecache: nfs_destroy_inodecache(); -out4: +err_nfspagecache: nfs_destroy_nfspagecache(); -out5: +err_proc: nfs_fs_proc_exit(); -out6: +err_nfsiod: nfsiod_stop(); -out7: +err_pernet: unregister_pernet_subsys(&nfs_net_ops); -out9: +err_sysfs: nfs_sysfs_exit(); -out10: +err_keyring: nfs_exit_keyring(); return err; }
--
2.55.0