summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
e9c97e4)
Clean up.
nfsumount.c:374: warning: ISO C forbids omitting the middle term of
a ?: expression
This is also probably harmless, but let's make the code unambiguous.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
res = try_remount(spec, node);
if (res)
goto writemtab;
res = try_remount(spec, node);
if (res)
goto writemtab;
} else
umnt_err = errno;
}
} else
umnt_err = errno;
}
if (umnt_err)
umount_error(umnt_err, node);
if (umnt_err)
umount_error(umnt_err, node);
if (mc) {
if (!lazy && strcmp(mc->m.mnt_type, "nfs4") != 0)
/* We ignore the error from nfs_umount23.
if (mc) {
if (!lazy && strcmp(mc->m.mnt_type, "nfs4") != 0)
/* We ignore the error from nfs_umount23.
* could cause /sbin/mount to retry!
*/
nfs_umount23(mc->m.mnt_fsname, mc->m.mnt_opts);
* could cause /sbin/mount to retry!
*/
nfs_umount23(mc->m.mnt_fsname, mc->m.mnt_opts);
- ret = del_mtab(mc->m.mnt_fsname, mc->m.mnt_dir) ?: ret;
+ ret = del_mtab(mc->m.mnt_fsname, mc->m.mnt_dir);
} else if (*spec != '/') {
if (!lazy)
ret = nfs_umount23(spec, "tcp,v3");
} else if (*spec != '/') {
if (!lazy)
ret = nfs_umount23(spec, "tcp,v3");