Commit 27c3b415 authored by Bob Peterson's avatar Bob Peterson

GFS2: Fix up some sparse warnings

This patch cleans up various pieces of GFS2 to avoid sparse errors.
This doesn't fix them all, but it fixes several. The first error,
in function glock_hash_walk was a genuine bug where the rhashtable
could be started and not stopped.
Signed-off-by: default avatarBob Peterson <rpeterso@redhat.com>
parent 561b7969
...@@ -1550,14 +1550,15 @@ static void glock_hash_walk(glock_examiner examiner, const struct gfs2_sbd *sdp) ...@@ -1550,14 +1550,15 @@ static void glock_hash_walk(glock_examiner examiner, const struct gfs2_sbd *sdp)
do { do {
gl = ERR_PTR(rhashtable_walk_start(&iter)); gl = ERR_PTR(rhashtable_walk_start(&iter));
if (gl) if (IS_ERR(gl))
continue; goto walk_stop;
while ((gl = rhashtable_walk_next(&iter)) && !IS_ERR(gl)) while ((gl = rhashtable_walk_next(&iter)) && !IS_ERR(gl))
if ((gl->gl_name.ln_sbd == sdp) && if (gl->gl_name.ln_sbd == sdp &&
lockref_get_not_dead(&gl->gl_lockref)) lockref_get_not_dead(&gl->gl_lockref))
examiner(gl); examiner(gl);
walk_stop:
rhashtable_walk_stop(&iter); rhashtable_walk_stop(&iter);
} while (cond_resched(), gl == ERR_PTR(-EAGAIN)); } while (cond_resched(), gl == ERR_PTR(-EAGAIN));
...@@ -1940,6 +1941,7 @@ static void gfs2_glock_iter_next(struct gfs2_glock_iter *gi) ...@@ -1940,6 +1941,7 @@ static void gfs2_glock_iter_next(struct gfs2_glock_iter *gi)
} }
static void *gfs2_glock_seq_start(struct seq_file *seq, loff_t *pos) static void *gfs2_glock_seq_start(struct seq_file *seq, loff_t *pos)
__acquires(RCU)
{ {
struct gfs2_glock_iter *gi = seq->private; struct gfs2_glock_iter *gi = seq->private;
loff_t n = *pos; loff_t n = *pos;
...@@ -1972,6 +1974,7 @@ static void *gfs2_glock_seq_next(struct seq_file *seq, void *iter_ptr, ...@@ -1972,6 +1974,7 @@ static void *gfs2_glock_seq_next(struct seq_file *seq, void *iter_ptr,
} }
static void gfs2_glock_seq_stop(struct seq_file *seq, void *iter_ptr) static void gfs2_glock_seq_stop(struct seq_file *seq, void *iter_ptr)
__releases(RCU)
{ {
struct gfs2_glock_iter *gi = seq->private; struct gfs2_glock_iter *gi = seq->private;
......
...@@ -23,8 +23,6 @@ ...@@ -23,8 +23,6 @@
#include "sys.h" #include "sys.h"
#include "trace_gfs2.h" #include "trace_gfs2.h"
extern struct workqueue_struct *gfs2_control_wq;
/** /**
* gfs2_update_stats - Update time based stats * gfs2_update_stats - Update time based stats
* @mv: Pointer to mean/variance structure to update * @mv: Pointer to mean/variance structure to update
...@@ -1176,7 +1174,7 @@ static void gdlm_recovery_result(struct gfs2_sbd *sdp, unsigned int jid, ...@@ -1176,7 +1174,7 @@ static void gdlm_recovery_result(struct gfs2_sbd *sdp, unsigned int jid,
spin_unlock(&ls->ls_recover_spin); spin_unlock(&ls->ls_recover_spin);
} }
const struct dlm_lockspace_ops gdlm_lockspace_ops = { static const struct dlm_lockspace_ops gdlm_lockspace_ops = {
.recover_prep = gdlm_recover_prep, .recover_prep = gdlm_recover_prep,
.recover_slot = gdlm_recover_slot, .recover_slot = gdlm_recover_slot,
.recover_done = gdlm_recover_done, .recover_done = gdlm_recover_done,
......
...@@ -151,6 +151,7 @@ extern struct kmem_cache *gfs2_rgrpd_cachep; ...@@ -151,6 +151,7 @@ extern struct kmem_cache *gfs2_rgrpd_cachep;
extern struct kmem_cache *gfs2_quotad_cachep; extern struct kmem_cache *gfs2_quotad_cachep;
extern struct kmem_cache *gfs2_qadata_cachep; extern struct kmem_cache *gfs2_qadata_cachep;
extern mempool_t *gfs2_page_pool; extern mempool_t *gfs2_page_pool;
extern struct workqueue_struct *gfs2_control_wq;
static inline unsigned int gfs2_tune_get_i(struct gfs2_tune *gt, static inline unsigned int gfs2_tune_get_i(struct gfs2_tune *gt,
unsigned int *p) unsigned int *p)
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
#include "meta_io.h" #include "meta_io.h"
#include "quota.h" #include "quota.h"
#include "rgrp.h" #include "rgrp.h"
#include "super.h"
#include "trans.h" #include "trans.h"
#include "util.h" #include "util.h"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment