diff options
| author | Chuck Lever <chuck.lever@oracle.com> | 2007-10-08 11:53:51 -0400 |
|---|---|---|
| committer | Neil Brown <neilb@suse.de> | 2007-10-09 11:18:04 +1000 |
| commit | b9f4b66a81420b0832ce4ef6965b1cdc9615772c (patch) | |
| tree | 2716fdc79591584ce05732f045971c0198105403 /utils/mount/mount.c | |
| parent | ba0c5b3b8a635ce671778b630787bce857ee81c7 (diff) | |
| download | nfs-utils-b9f4b66a81420b0832ce4ef6965b1cdc9615772c.tar.gz nfs-utils-b9f4b66a81420b0832ce4ef6965b1cdc9615772c.tar.xz nfs-utils-b9f4b66a81420b0832ce4ef6965b1cdc9615772c.zip | |
text-based mount.nfs: combine nfsmount_s() and nfs4mount_s() paths
The top-level logic that handles text-based mount options is mostly the
same for NFS and NFSv4 mounts. To improve maintainability, let's combine
the nfsmount_s() and nfs4mount_s() functions.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Neil Brown <neilb@suse.de>
Diffstat (limited to 'utils/mount/mount.c')
| -rw-r--r-- | utils/mount/mount.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/utils/mount/mount.c b/utils/mount/mount.c index e622231..21946f7 100644 --- a/utils/mount/mount.c +++ b/utils/mount/mount.c @@ -376,14 +376,10 @@ static int try_mount(char *spec, char *mount_point, int flags, { int ret; - if (string) { - if (strcmp(fs_type, "nfs4") == 0) - ret = nfs4mount_s(spec, mount_point, flags, - extra_opts, fake, bg); - else - ret = nfsmount_s(spec, mount_point, flags, - extra_opts, fake, bg); - } else { + if (string) + ret = nfsmount_string(spec, mount_point, fs_type, flags, + extra_opts, fake, bg); + else { if (strcmp(fs_type, "nfs4") == 0) ret = nfs4mount(spec, mount_point, flags, extra_opts, fake, bg); |