Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
e7f5c01c
Commit
e7f5c01c
authored
Apr 27, 2006
by
David Teigland
Committed by
Steven Whitehouse
Apr 27, 2006
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[GFS2] Remove redundant casts to/from void
Signed-off-by:
Steven Whitehouse
<
swhiteho@redhat.com
>
parent
6bd70aba
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
8 deletions
+7
-8
fs/gfs2/glock.c
fs/gfs2/glock.c
+5
-6
fs/gfs2/locking/dlm/lock.c
fs/gfs2/locking/dlm/lock.c
+2
-2
No files found.
fs/gfs2/glock.c
View file @
e7f5c01c
...
@@ -1348,7 +1348,7 @@ void gfs2_glock_force_drop(struct gfs2_glock *gl)
...
@@ -1348,7 +1348,7 @@ void gfs2_glock_force_drop(struct gfs2_glock *gl)
static
void
greedy_work
(
void
*
data
)
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_holder
*
gh
=
&
gr
->
gr_gh
;
struct
gfs2_glock
*
gl
=
gh
->
gh_gl
;
struct
gfs2_glock
*
gl
=
gh
->
gh_gl
;
struct
gfs2_glock_operations
*
glops
=
gl
->
gl_ops
;
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)
...
@@ -1745,19 +1745,19 @@ void gfs2_glock_cb(lm_fsdata_t *fsdata, unsigned int type, void *data)
switch
(
type
)
{
switch
(
type
)
{
case
LM_CB_NEED_E
:
case
LM_CB_NEED_E
:
blocking_cb
(
sdp
,
(
struct
lm_lockname
*
)
data
,
LM_ST_UNLOCKED
);
blocking_cb
(
sdp
,
data
,
LM_ST_UNLOCKED
);
return
;
return
;
case
LM_CB_NEED_D
:
case
LM_CB_NEED_D
:
blocking_cb
(
sdp
,
(
struct
lm_lockname
*
)
data
,
LM_ST_DEFERRED
);
blocking_cb
(
sdp
,
data
,
LM_ST_DEFERRED
);
return
;
return
;
case
LM_CB_NEED_S
:
case
LM_CB_NEED_S
:
blocking_cb
(
sdp
,
(
struct
lm_lockname
*
)
data
,
LM_ST_SHARED
);
blocking_cb
(
sdp
,
data
,
LM_ST_SHARED
);
return
;
return
;
case
LM_CB_ASYNC
:
{
case
LM_CB_ASYNC
:
{
struct
lm_async_cb
*
async
=
(
struct
lm_async_cb
*
)
data
;
struct
lm_async_cb
*
async
=
data
;
struct
gfs2_glock
*
gl
;
struct
gfs2_glock
*
gl
;
gl
=
gfs2_glock_find
(
sdp
,
&
async
->
lc_name
);
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)
...
@@ -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
))
if
(
!
gfs2_assert_warn
(
sdp
,
gl
->
gl_req_bh
))
gl
->
gl_req_bh
(
gl
,
async
->
lc_ret
);
gl
->
gl_req_bh
(
gl
,
async
->
lc_ret
);
gfs2_glock_put
(
gl
);
gfs2_glock_put
(
gl
);
return
;
return
;
}
}
...
...
fs/gfs2/locking/dlm/lock.c
View file @
e7f5c01c
...
@@ -25,7 +25,7 @@ static void queue_complete(struct gdlm_lock *lp)
...
@@ -25,7 +25,7 @@ static void queue_complete(struct gdlm_lock *lp)
static
inline
void
gdlm_ast
(
void
*
astarg
)
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
)
static
inline
void
gdlm_bast
(
void
*
astarg
,
int
mode
)
...
@@ -257,7 +257,7 @@ unsigned int gdlm_do_lock(struct gdlm_lock *lp)
...
@@ -257,7 +257,7 @@ unsigned int gdlm_do_lock(struct gdlm_lock *lp)
lp
->
cur
,
lp
->
req
,
lp
->
lkf
);
lp
->
cur
,
lp
->
req
,
lp
->
lkf
);
error
=
dlm_lock
(
ls
->
dlm_lockspace
,
lp
->
req
,
&
lp
->
lksb
,
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
);
bast
?
gdlm_bast
:
NULL
);
if
((
error
==
-
EAGAIN
)
&&
(
lp
->
lkf
&
DLM_LKF_NOQUEUE
))
{
if
((
error
==
-
EAGAIN
)
&&
(
lp
->
lkf
&
DLM_LKF_NOQUEUE
))
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment