[PATCH] Missed fixups wrt Bounce and Backmerge

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

diff --git a/README b/README
index afef0c45c2802fc0afbd3d73cdf817d810658621..741b8f6385aaad7d211fa6e1781b0ffe7e1a8b75 100644 (file)
--- a/README
+++ b/README
@@ -109,13 +109,13 @@ $ blkparse -i <input> [ -o <output> ] [ -b rb_batch ] [ -s ] [ -t ] [ -q ]
        -F Format specification. The individual specifiers are:
 
                A       - Remap
-               B       - Back merge
+               B       - Bounce
                C       - Complete
                D       - Issue
+               M       - Back merge
                F       - Front merge
                G       - Get request
                I       - Insert
-               M       - Both front and back merge
                P       - Plug
                Q       - Queue
                R       - Requeue

diff --git a/blkparse_fmt.c b/blkparse_fmt.c
index b309b4b39ff0b82a44cee58fde4aa1be1197b436..4560e568873d33a4c24c513badef9623c86cfcc1 100644 (file)
--- a/blkparse_fmt.c
+++ b/blkparse_fmt.c
@@ -49,14 +49,7 @@ int add_format_spec(char *option)
                return 1;
        }
 
-       /*
-        * Set both merges (front and back)
-        */
-       if (spec == 'M') {
-               override_format['B'] = strdup(option);
-               override_format['M'] = strdup(option);
-       } else
-               override_format[spec] = strdup(option);
+       override_format[spec] = strdup(option);
 
        return 0;
 }