aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Teigland <teigland@redhat.com>2006-04-27 11:25:45 -0400
committerSteven Whitehouse <swhiteho@redhat.com>2006-04-27 11:25:45 -0400
commite7f5c01caddbad150dcf003f76cd5aac413f4c50 (patch)
treea37538fc8c067fb169110ccba9788302cdace1d2
parent6bd70aba5ab453459bb53b1e29f0e0650d6c311f (diff)
[GFS2] Remove redundant casts to/from void
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
-rw-r--r--fs/gfs2/glock.c11
-rw-r--r--fs/gfs2/locking/dlm/lock.c4
2 files changed, 7 insertions, 8 deletions
diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
index 67e3f2a4d10..17d474fab5a 100644
--- a/fs/gfs2/glock.c
+++ b/fs/gfs2/glock.c
@@ -1348,7 +1348,7 @@ void gfs2_glock_force_drop(struct gfs2_glock *gl)
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 @@ void gfs2_glock_cb(lm_fsdata_t *fsdata, unsigned int type, void *data)
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 @@ void gfs2_glock_cb(lm_fsdata_t *fsdata, unsigned int type, void *data)
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 1799d2237e7..a309b799dff 100644
--- a/fs/gfs2/locking/dlm/lock.c
+++ b/fs/gfs2/locking/dlm/lock.c
@@ -25,7 +25,7 @@ static void queue_complete(struct gdlm_lock *lp)
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 @@ unsigned int gdlm_do_lock(struct gdlm_lock *lp)
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)) {