[GFS2] Remove redundant casts to/from void
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
index 67e3f2a..17d474f 100644
--- a/fs/gfs2/glock.c
+++ b/fs/gfs2/glock.c
@@ -1348,7 +1348,7 @@
static void greedy_work(void *data)
{
- struct greedy *gr = (struct greedy *)data;
+ struct greedy *gr = data;
struct gfs2_holder *gh = &gr->gr_gh;
struct gfs2_glock *gl = gh->gh_gl;
struct gfs2_glock_operations *glops = gl->gl_ops;
@@ -1745,19 +1745,19 @@
switch (type) {
case LM_CB_NEED_E:
- blocking_cb(sdp, (struct lm_lockname *)data, LM_ST_UNLOCKED);
+ blocking_cb(sdp, data, LM_ST_UNLOCKED);
return;
case LM_CB_NEED_D:
- blocking_cb(sdp, (struct lm_lockname *)data, LM_ST_DEFERRED);
+ blocking_cb(sdp, data, LM_ST_DEFERRED);
return;
case LM_CB_NEED_S:
- blocking_cb(sdp, (struct lm_lockname *)data, LM_ST_SHARED);
+ blocking_cb(sdp, data, LM_ST_SHARED);
return;
case LM_CB_ASYNC: {
- struct lm_async_cb *async = (struct lm_async_cb *)data;
+ struct lm_async_cb *async = data;
struct gfs2_glock *gl;
gl = gfs2_glock_find(sdp, &async->lc_name);
@@ -1766,7 +1766,6 @@
if (!gfs2_assert_warn(sdp, gl->gl_req_bh))
gl->gl_req_bh(gl, async->lc_ret);
gfs2_glock_put(gl);
-
return;
}
diff --git a/fs/gfs2/locking/dlm/lock.c b/fs/gfs2/locking/dlm/lock.c
index 1799d22..a309b79 100644
--- a/fs/gfs2/locking/dlm/lock.c
+++ b/fs/gfs2/locking/dlm/lock.c
@@ -25,7 +25,7 @@
static inline void gdlm_ast(void *astarg)
{
- queue_complete((struct gdlm_lock *) astarg);
+ queue_complete(astarg);
}
static inline void gdlm_bast(void *astarg, int mode)
@@ -257,7 +257,7 @@
lp->cur, lp->req, lp->lkf);
error = dlm_lock(ls->dlm_lockspace, lp->req, &lp->lksb, lp->lkf,
- str.name, str.namelen, 0, gdlm_ast, (void *) lp,
+ str.name, str.namelen, 0, gdlm_ast, lp,
bast ? gdlm_bast : NULL);
if ((error == -EAGAIN) && (lp->lkf & DLM_LKF_NOQUEUE)) {