From: Paul Gortmaker <paul.gortmaker@windriver.com>
Date: Thu, 13 Jun 2013 02:56:35 +0000 (-0400)
Subject: jbd2: fix duplicate debug label for phase 2
X-Git-Tag: omap-for-v3.11/fixes-for-merge-window~83^2~21
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cfc7bc896f45251bdcfa45e0d62fda0566e95c4a;p=pandora-kernel.git

jbd2: fix duplicate debug label for phase 2

Currently we see this output:

  $git grep phase fs/jbd2
  fs/jbd2/commit.c:       jbd_debug(3, "JBD2: commit phase 1\n");
  fs/jbd2/commit.c:       jbd_debug(3, "JBD2: commit phase 2\n");
  fs/jbd2/commit.c:       jbd_debug(3, "JBD2: commit phase 2\n");
  fs/jbd2/commit.c:       jbd_debug(3, "JBD2: commit phase 3\n");
  fs/jbd2/commit.c:       jbd_debug(3, "JBD2: commit phase 4\n");
  [...]

There is clearly a duplicate label for phase 2, and they are
both active (i.e. not in #if ... #else block).  Rename them to
be "2a" and "2b" so the debug output is unambiguous.

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
---

Reading git-diff-tree failed