diff options
author | Alasdair G Kergon <agk@redhat.com> | 2016-06-23 21:31:49 +0100 |
---|---|---|
committer | Alasdair G Kergon <agk@redhat.com> | 2016-06-23 21:31:49 +0100 |
commit | e99a31c9502a2081c6608a831b601081008cc3b0 (patch) | |
tree | 801442ba7a27872d19aaabd5b2b9e2d53079f4be | |
parent | a67a5d465576d4a7c17b22a737725d6dee059e18 (diff) | |
download | lvm2-e99a31c9502a2081c6608a831b601081008cc3b0.tar.gz |
Revert "locking: trace errors from dir creation"
This reverts commit fa69ed0bc845df3d2c7ae68d03cdd4a3dec339d8.
This code sometimes expects to be presented with a read-only filesystem
(during some boot sequences for example) and copes appropriately with
this and it should not lead to expected error messages that might cause
unnecessary alarm.
-rw-r--r-- | WHATS_NEW | 3 | ||||
-rw-r--r-- | lib/locking/file_locking.c | 6 |
2 files changed, 3 insertions, 6 deletions
@@ -1,9 +1,8 @@ Version 2.02.158 - ================================= Pool metadata lvresize uses now same code as resize of normal volume. - Log system error when locking dir cannot be accessed. Preserve monitoring status when updating thin-pool metadata. - Rerurn 0 (inactive) when status cannot be queried in _lv_active(). + Return 0 (inactive) when status cannot be queried in _lv_active(). Switch to log_warn() for failing activation status query. Refactor lvconvert argument handling code. Add --logonly option to report only cmd log for a command, not other reports. diff --git a/lib/locking/file_locking.c b/lib/locking/file_locking.c index 390f49ffe..230303b47 100644 --- a/lib/locking/file_locking.c +++ b/lib/locking/file_locking.c @@ -158,13 +158,11 @@ int init_file_locking(struct locking_type *locking, struct cmd_context *cmd, (void) dm_prepare_selinux_context(NULL, 0); if (!r) - return_0; + return 0; /* Trap a read-only file system */ - if ((access(_lock_dir, R_OK | W_OK | X_OK) == -1) && (errno == EROFS)) { - log_sys_error("access", _lock_dir); + if ((access(_lock_dir, R_OK | W_OK | X_OK) == -1) && (errno == EROFS)) return 0; - } return 1; } |