rpms/am-utils
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- fix ambiguous else due to dlog() macro usage.

Browse Source
This commit is contained in:
Ian Kent 2016-10-03 16:54:15 +08:00
parent cff2af1e74
commit cc01065e15
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
am-utils-6.2-fix-umount-to-mount-race.patch
View File

@ -16,13 +16,13 @@ fixes the problem.
Signed-off-by: Richard P <richardp345@gmail.com>
Signed-off-by: Ian Kent <raven@themaw.net>
---
amd/amfs_generic.c | 7 +++++--
amd/amfs_generic.c | 8 ++++++--
amd/autil.c | 6 ++++++
2 files changed, 11 insertions(+), 2 deletions(-)
2 files changed, 12 insertions(+), 2 deletions(-)
--- am-utils-6.2.orig/amd/amfs_generic.c
+++ am-utils-6.2/amd/amfs_generic.c
@@ -743,9 +743,12 @@ amfs_bgmount(struct continuation *cp)
@@ -743,9 +743,13 @@ amfs_bgmount(struct continuation *cp)
if (mf->mf_flags & (MFF_MOUNTING | MFF_UNMOUNTING)) {
/*
@ -30,10 +30,11 @@ Signed-off-by: Ian Kent <raven@themaw.net>
+ * Still mounting or umounting - retry later
*/
- dlog("mount of \"%s\" already pending", mf->mf_info);
+ if (mf->mf_flags & MFF_MOUNTING)
+ if (mf->mf_flags & MFF_MOUNTING) {
+ dlog("mount of \"%s\" already pending", mf->mf_info);
+ else
+ } else {
+ dlog("unmount of \"%s\" already pending", mf->mf_info);
+ }
goto retry;
}

5
am-utils.spec
View File

@ -2,7 +2,7 @@ Summary: Automount utilities including an updated version of Amd
Name: am-utils
Version: 6.2.0
%define upstream_version 6.2
Release: 21%{?dist}
Release: 22%{?dist}
License: BSD
Epoch: 5
Group: System Environment/Daemons
@ -251,6 +251,9 @@ fi
%{_libdir}/libamu.so*
%changelog
* Mon Oct 3 2016 Ian Kent <ikent@redhat.com> - 5:6.2.0-22
- fix ambiguous else due to dlog() macro usage.
* Wed Sep 14 2016 Ian Kent <ikent@redhat.com> - 5:6.2.0-21
- fix typo in libtirpc configure macro.