2019-11-22 16:28:20

by Petr Vorel

Subject: [nfs-utils PATCH 1/1] mount: Fix return 0 from void function

Fixes: d5e30346 ("mount: Do not overwrite /etc/mtab if it's symlink")

Signed-off-by: Petr Vorel <[email protected]>
---
Hi Steve,

sorry for introducing a regression.

Kind regards,
Petr

utils/mount/mount.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/mount/mount.c b/utils/mount/mount.c
index 92a0dfe4..2be3dc2f 100644
--- a/utils/mount/mount.c
+++ b/utils/mount/mount.c
@@ -208,7 +208,7 @@ create_mtab (void) {
that would create a file /proc/mounts in case the proc filesystem
is not mounted, and the fchmod below would also fail. */
if (mtab_is_a_symlink()) {
- return EX_SUCCESS;
+ return;
}

lock_mtab();
--
2.24.0

2019-11-22 18:10:46

by Steve Dickson

Subject: Re: [nfs-utils PATCH 1/1] mount: Fix return 0 from void function

On 11/22/19 11:25 AM, Petr Vorel wrote:
> Fixes: d5e30346 ("mount: Do not overwrite /etc/mtab if it's symlink")
>
> Signed-off-by: Petr Vorel <[email protected]>
> ---
> Hi Steve,
>
> sorry for introducing a regression.
No biggie... I should have caught it and I would think the
compiler should say something... Throw a warning or something.

Committed (tag: nfs-utils-2-4-3-rc2)

steved.

>
> Kind regards,
> Petr
>
> utils/mount/mount.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/utils/mount/mount.c b/utils/mount/mount.c
> index 92a0dfe4..2be3dc2f 100644
> --- a/utils/mount/mount.c
> +++ b/utils/mount/mount.c
> @@ -208,7 +208,7 @@ create_mtab (void) {
> that would create a file /proc/mounts in case the proc filesystem
> is not mounted, and the fchmod below would also fail. */
> if (mtab_is_a_symlink()) {
> - return EX_SUCCESS;
> + return;
> }
>
> lock_mtab();
>