]>
Commit | Line | Data |
---|---|---|
a6003639 DM |
1 | Index: new/lib/locking/cluster_locking.c |
2 | =================================================================== | |
3 | --- new.orig/lib/locking/cluster_locking.c 2011-09-21 10:08:21.000000000 +0200 | |
4 | +++ new/lib/locking/cluster_locking.c 2011-09-21 10:10:55.000000000 +0200 | |
5 | @@ -66,10 +66,14 @@ | |
6 | { | |
7 | int local_socket; | |
8 | struct sockaddr_un sockaddr; | |
9 | + int suppress_messages = 0; | |
10 | + | |
11 | + if (ignorelockingfailure() && getenv("LVM_SUPPRESS_LOCKING_FAILURE_MESSAGES")) | |
12 | + suppress_messages = 1; | |
13 | ||
14 | /* Open local socket */ | |
15 | if ((local_socket = socket(PF_UNIX, SOCK_STREAM, 0)) < 0) { | |
16 | - log_error("Local socket creation failed: %s", strerror(errno)); | |
17 | + log_error_suppress(suppress_messages, "Local socket creation failed: %s", strerror(errno)); | |
18 | return -1; | |
19 | } | |
20 | ||
21 | @@ -82,7 +86,7 @@ | |
22 | sizeof(sockaddr))) { | |
23 | int saved_errno = errno; | |
24 | ||
25 | - log_error("connect() failed on local socket: %s", | |
26 | + log_error_suppress(suppress_messages, "connect() failed on local socket: %s", | |
27 | strerror(errno)); | |
28 | if (close(local_socket)) | |
29 | stack; |