enable issue_discard in default lvm.conf

[lvm.git] / patchdir / autodetect-locking-type.patch

diff --git a/patchdir/autodetect-locking-type.patch b/patchdir/autodetect-locking-type.patch
index 2494085b380db05968495a67695e42743b708911..bb4edeff954c39a25e795586127b7de6699c7bc3 100644 (file)
--- a/patchdir/autodetect-locking-type.patch
+++ b/patchdir/autodetect-locking-type.patch
@@ -42,32 +42,3 @@ Index: new/doc/example.conf.in
  
      # Set to 0 to fail when a lock request cannot be satisfied immediately.
      wait_for_locks = 1
-Index: new/lib/locking/cluster_locking.c
-===================================================================
---- new.orig/lib/locking/cluster_locking.c     2011-09-21 10:08:21.000000000 +0200
-+++ new/lib/locking/cluster_locking.c  2011-09-21 10:10:55.000000000 +0200
-@@ -66,10 +66,14 @@
- {
-       int local_socket;
-       struct sockaddr_un sockaddr;
-+      int suppress_messages = 0;
-+
-+      if (ignorelockingfailure() && getenv("LVM_SUPPRESS_LOCKING_FAILURE_MESSAGES"))
-+              suppress_messages = 1;
- 
-       /* Open local socket */
-       if ((local_socket = socket(PF_UNIX, SOCK_STREAM, 0)) < 0) {
--              log_error("Local socket creation failed: %s", strerror(errno));
-+              log_error_suppress(suppress_messages, "Local socket creation failed: %s", strerror(errno));
-               return -1;
-       }
- 
-@@ -82,7 +86,7 @@
-                   sizeof(sockaddr))) {
-               int saved_errno = errno;
- 
--              log_error("connect() failed on local socket: %s",
-+              log_error_suppress(suppress_messages, "connect() failed on local socket: %s",
-                         strerror(errno));
-               if (close(local_socket))
-                       stack;