chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
path: after installing inotify watches, recheck file again to fix race
[elogind.git]
/
src
/
umount.c
diff --git
a/src/umount.c
b/src/umount.c
index 0081d979d9d0128fd99ffa179dcebffc943d6484..4fd6b22ad78620e3585985b0a3f9a19989a827b3 100644
(file)
--- a/
src/umount.c
+++ b/
src/umount.c
@@
-105,7
+105,7
@@
static int mount_points_list_get(MountPoint **head) {
goto finish;
}
goto finish;
}
- if (mount_point_is_api(p)) {
+ if (mount_point_is_api(p)
|| mount_point_ignore(p)
) {
free(p);
continue;
}
free(p);
continue;
}
@@
-466,12
+466,24
@@
static int swap_points_list_off(MountPoint **head, bool *changed) {
static int loopback_points_list_detach(MountPoint **head, bool *changed) {
MountPoint *m, *n;
static int loopback_points_list_detach(MountPoint **head, bool *changed) {
MountPoint *m, *n;
- int n_failed = 0;
+ int n_failed = 0, k;
+ struct stat root_st;
assert(head);
assert(head);
+ k = lstat("/", &root_st);
+
LIST_FOREACH_SAFE(mount_point, m, n, *head) {
int r;
LIST_FOREACH_SAFE(mount_point, m, n, *head) {
int r;
+ struct stat loopback_st;
+
+ if (k >= 0 &&
+ major(root_st.st_dev) != 0 &&
+ lstat(m->path, &loopback_st) >= 0 &&
+ root_st.st_dev == loopback_st.st_rdev) {
+ n_failed ++;
+ continue;
+ }
if ((r = delete_loopback(m->path)) >= 0) {
if ((r = delete_loopback(m->path)) >= 0) {
@@
-490,13
+502,23
@@
static int loopback_points_list_detach(MountPoint **head, bool *changed) {
static int dm_points_list_detach(MountPoint **head, bool *changed) {
MountPoint *m, *n;
static int dm_points_list_detach(MountPoint **head, bool *changed) {
MountPoint *m, *n;
- int n_failed = 0;
+ int n_failed = 0, k;
+ struct stat root_st;
assert(head);
assert(head);
+ k = lstat("/", &root_st);
+
LIST_FOREACH_SAFE(mount_point, m, n, *head) {
int r;
LIST_FOREACH_SAFE(mount_point, m, n, *head) {
int r;
+ if (k >= 0 &&
+ major(root_st.st_dev) != 0 &&
+ root_st.st_dev == m->devnum) {
+ n_failed ++;
+ continue;
+ }
+
if ((r = delete_dm(m->devnum)) >= 0) {
if (r > 0 && changed)
if ((r = delete_dm(m->devnum)) >= 0) {
if (r > 0 && changed)