redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

NFS: Clean up error handling in nfs_get_sb

Browse source 
The error return logic in nfs_get_sb now matches nfs4_get_sb, and is more maintainable.
A subsequent patch will take advantage of this simplification.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
Chuck Lever 2007-07-01 12:12:35 -04:00 committed by Trond Myklebust
parent 29eb981a3b
commit 0655960f76
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
fs/nfs/super.c
View file

@ -633,13 +633,13 @@ static int nfs_get_sb(struct file_system_type *fs_type,
/* Validate the mount data */ /* Validate the mount data */
error = nfs_validate_mount_data(data, &mntfh); error = nfs_validate_mount_data(data, &mntfh);
if (error < 0) if (error < 0)
return error; goto out;
/* Get a volume representation */ /* Get a volume representation */
server = nfs_create_server(data, &mntfh); server = nfs_create_server(data, &mntfh);
if (IS_ERR(server)) { if (IS_ERR(server)) {
error = PTR_ERR(server); error = PTR_ERR(server);
goto out_err_noserver; goto out;
} }
/* Get a superblock - note that we may end up sharing one that already exists */ /* Get a superblock - note that we may end up sharing one that already exists */
@ -669,17 +669,19 @@ static int nfs_get_sb(struct file_system_type *fs_type,
s->s_flags |= MS_ACTIVE; s->s_flags |= MS_ACTIVE;
mnt->mnt_sb = s; mnt->mnt_sb = s;
mnt->mnt_root = mntroot; mnt->mnt_root = mntroot;
return 0; error = 0;
out:
return error;
out_err_nosb: out_err_nosb:
nfs_free_server(server); nfs_free_server(server);
out_err_noserver: goto out;
return error;
error_splat_super: error_splat_super:
up_write(&s->s_umount); up_write(&s->s_umount);
deactivate_super(s); deactivate_super(s);
return error; goto out;
} }
/* /*