gfs2_glops_list duplicate initialiser
Hi Steven,
I was running sparse on the current main kernel git tree and
it spotted:
fs/gfs2/glops.c:456:10: warning: Initializer entry defined twicefs/gfs2/glops.c:459:10: also defined here
That's:
const struct gfs2_glock_operations *gfs2_glops_list[] = {
[LM_TYPE_META] = &gfs2_meta_glops,
[LM_TYPE_INODE] = &gfs2_inode_glops,
[LM_TYPE_RGRP] = &gfs2_rgrp_glops,
[LM_TYPE_NONDISK] = &gfs2_trans_glops,
[LM_TYPE_IOPEN] = &gfs2_iopen_glops,
[LM_TYPE_FLOCK] = &gfs2_flock_glops,
[LM_TYPE_NONDISK] = &gfs2_nondisk_glops,
[LM_TYPE_QUOTA] = &gfs2_quota_glops,
[LM_TYPE_JOURNAL] = &gfs2_journal_glops,
};The two separate assignments with the index of LM_TYPE_NONDISK are as it says a bit odd; it's not obvious to me what the right index is for the thing that is assigned &gfs2_trans_glops.
Dave
Signature · 4 lines
-----Open up your eyes, open up your mind, open up your code ------- / Dr. David Alan Gilbert | Running GNU/Linux | Happy \ \ gro.gilbert @ treblig.org | | In Hex / \ _________________________|_____ http://www.treblig.org |_______/
Hi,
Thanks for pointing out this issue. I'm not sure how that got missed, except that this code is used only for a debugging interface and so far the focus has been on other glock types. Either way we should fix it, and the following patch should solve the issue,
Steve.
-----------------------------------------------------------------------------
Quoted 1 line
From
134669854e3a680d8aad9a4047891c653715f4c0Mon Sep 17 00:00:00 2001
From: Steven Whitehouse <[email protected]>
Date: Wed, 6 Oct 2010 09:58:44 +0100
Subject: [PATCH] GFS2: Fix type mapping for demote_rq interface
Mostly the glock operations follow the type of the glock. The one exception is the transaction glock, so we need to check for that directly.
fs/gfs2/glops.c +0 -1
@@ -452,7 +452,6 @@ const struct gfs2_glock_operations *gfs2_glops_list[] = { [LM_TYPE_META] = &gfs2_meta_glops, [LM_TYPE_INODE] = &gfs2_inode_glops, [LM_TYPE_RGRP] = &gfs2_rgrp_glops, - [LM_TYPE_NONDISK] = &gfs2_trans_glops, [LM_TYPE_IOPEN] = &gfs2_iopen_glops, [LM_TYPE_FLOCK] = &gfs2_flock_glops, [LM_TYPE_NONDISK] = &gfs2_nondisk_glops,
fs/gfs2/sys.c +4 -1
@@ -230,7 +230,10 @@ static ssize_t demote_rq_store(struct gfs2_sbd *sdp, const char *buf, size_t lenif (gltype >LM_TYPE_JOURNAL )return -EINVAL ; - glops = gfs2_glops_list[gltype]; +if (gltype ==LM_TYPE_NONDISK && glnum ==GFS2_TRANS_LOCK ) + glops = &gfs2_trans_glops; +else + glops = gfs2_glops_list[gltype];if (glops ==NULL )return -EINVAL ;if (!test_and_set_bit (SDF_DEMOTE , &sdp->sd_flags))
Signature · 1 line
1.7.1.1