gfs2: dump fsid when dumping glock problems

Before this patch, if a glock error was encountered, the glock with
the problem was dumped. But sometimes you may have lots of file systems
mounted, and that doesn't tell you which file system it was for.

This patch adds a new boolean parameter fsid to the dump_glock family
of functions. For non-error cases, such as dumping the glocks debugfs
file, the fsid is not dumped in order to keep lock dumps and glocktop
as clean as possible. For all error cases, such as GLOCK_BUG_ON, the
file system id is now printed. This will make it easier to debug.

Signed-off-by: Bob Peterson <rpeterso@redhat.com>
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>

1 files changed, 3 insertions, 1 deletions

diff --git a/fs/gfs2/util.c b/fs/gfs2/util.c
index 6aea0146e0c8..83f6c582773a 100644
--- a/fs/gfs2/util.c
+++ b/fs/gfs2/util.c
@@ -178,9 +178,11 @@ int gfs2_consist_rgrpd_i(struct gfs2_rgrpd *rgd, int cluster_wide,
                          const char *function, char *file, unsigned int line)
 {
         struct gfs2_sbd *sdp = rgd->rd_sbd;
+        char fs_id_buf[GFS2_FSNAME_LEN + 3 * sizeof(int) + 2];
         int rv;
 
-        gfs2_rgrp_dump(NULL, rgd->rd_gl);
+        sprintf(fs_id_buf, "fsid=%s: ", sdp->sd_fsname);
+        gfs2_rgrp_dump(NULL, rgd->rd_gl, fs_id_buf);
         rv = gfs2_lm_withdraw(sdp,
                               "fatal: filesystem consistency error\n"
                               "  RG = %llu\n"