]> sourceware.org Git - lvm2.git/commitdiff
debug: drop DEBUG_MEM path
authorZdenek Kabelac <zkabelac@redhat.com>
Tue, 23 Jan 2018 10:41:53 +0000 (11:41 +0100)
committerZdenek Kabelac <zkabelac@redhat.com>
Tue, 23 Jan 2018 10:45:18 +0000 (11:45 +0100)
Memory is not allocated so no DEBUG_MEM part is needed.

lib/device/dev-io.c

index 0137d5d270ed493c3b73bccdce38a4179ead1cef..c4666122df1fbd816cb7255e4ec5d6b39263e369 100644 (file)
@@ -303,7 +303,7 @@ static int _aligned_io(struct device_area *where, char *write_buffer,
        } 
 
        devbuf = DEV_DEVBUF(where->dev, reason);
-       _release_devbuf(devbuf);
+       _release_devbuf(devbuf);
        devbuf->where.dev = where->dev;
        devbuf->where.start = widened.start;
        devbuf->where.size = widened.size;
@@ -317,24 +317,8 @@ static int _aligned_io(struct device_area *where, char *write_buffer,
                /* Perform the I/O directly. */
                devbuf->buf = write_buffer;
        else
-#ifndef DEBUG_MEM
                /* Postpone buffer allocation until we're about to issue the I/O */
                devbuf->buf = NULL;
-#else
-       else {
-               /* Allocate a bounce buffer with an extra block */
-               if (!(devbuf->malloc_address = devbuf->buf = dm_malloc((size_t) devbuf->where.size + block_size))) {
-                       log_error("Bounce buffer malloc failed");
-                       return 0;
-               }
-
-               /*
-                * Realign start of bounce buffer (using the extra sector)
-                */
-               if (((uintptr_t) devbuf->buf) & mask)
-                       devbuf->buf = (char *) ((((uintptr_t) devbuf->buf) + mask) & ~mask);
-       }
-#endif
 
        devbuf->write = 0;
 
This page took 0.036582 seconds and 5 git commands to generate.