Skip to content

Commit 6717386

Browse files
Christoph HellwigTrond Myklebust
authored andcommitted
NFS: cleanup error handling in nfs4_server_common_setup
Return error directly instead of using a goto label for it. Signed-off-by: Christoph Hellwig <hch@lst.de> Link: https://lore.kernel.org/r/20250718081509.2607553-2-hch@lst.de Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
1 parent f06bedf commit 6717386

1 file changed

Lines changed: 4 additions & 5 deletions

File tree

fs/nfs/nfs4client.c

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1103,14 +1103,14 @@ static int nfs4_server_common_setup(struct nfs_server *server,
11031103
/* We must ensure the session is initialised first */
11041104
error = nfs4_init_session(server->nfs_client);
11051105
if (error < 0)
1106-
goto out;
1106+
return error;
11071107

11081108
nfs4_server_set_init_caps(server);
11091109

11101110
/* Probe the root fh to retrieve its FSID and filehandle */
11111111
error = nfs4_get_rootfh(server, mntfh, auth_probe);
11121112
if (error < 0)
1113-
goto out;
1113+
return error;
11141114

11151115
dprintk("Server FSID: %llx:%llx\n",
11161116
(unsigned long long) server->fsid.major,
@@ -1119,7 +1119,7 @@ static int nfs4_server_common_setup(struct nfs_server *server,
11191119

11201120
error = nfs_probe_server(server, mntfh);
11211121
if (error < 0)
1122-
goto out;
1122+
return error;
11231123

11241124
nfs4_session_limit_rwsize(server);
11251125
nfs4_session_limit_xasize(server);
@@ -1130,8 +1130,7 @@ static int nfs4_server_common_setup(struct nfs_server *server,
11301130
nfs_server_insert_lists(server);
11311131
server->mount_time = jiffies;
11321132
server->destroy = nfs4_destroy_server;
1133-
out:
1134-
return error;
1133+
return 0;
11351134
}
11361135

11371136
/*

0 commit comments

Comments
 (0)