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
nexedi
linux
Commits
6d7bbbba
Commit
6d7bbbba
authored
Jul 15, 2008
by
J. Bruce Fields
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lockd: minor svclock.c style fixes
Signed-off-by:
J. Bruce Fields
<
bfields@citi.umich.edu
>
parent
6cde4de8
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
fs/lockd/svclock.c
fs/lockd/svclock.c
+5
-5
No files found.
fs/lockd/svclock.c
View file @
6d7bbbba
...
@@ -129,9 +129,9 @@ nlmsvc_lookup_block(struct nlm_file *file, struct nlm_lock *lock)
...
@@ -129,9 +129,9 @@ nlmsvc_lookup_block(struct nlm_file *file, struct nlm_lock *lock)
static
inline
int
nlm_cookie_match
(
struct
nlm_cookie
*
a
,
struct
nlm_cookie
*
b
)
static
inline
int
nlm_cookie_match
(
struct
nlm_cookie
*
a
,
struct
nlm_cookie
*
b
)
{
{
if
(
a
->
len
!=
b
->
len
)
if
(
a
->
len
!=
b
->
len
)
return
0
;
return
0
;
if
(
memcmp
(
a
->
data
,
b
->
data
,
a
->
len
))
if
(
memcmp
(
a
->
data
,
b
->
data
,
a
->
len
))
return
0
;
return
0
;
return
1
;
return
1
;
}
}
...
@@ -381,7 +381,7 @@ nlmsvc_lock(struct svc_rqst *rqstp, struct nlm_file *file,
...
@@ -381,7 +381,7 @@ nlmsvc_lock(struct svc_rqst *rqstp, struct nlm_file *file,
block
=
nlmsvc_lookup_block
(
file
,
lock
);
block
=
nlmsvc_lookup_block
(
file
,
lock
);
if
(
block
==
NULL
)
{
if
(
block
==
NULL
)
{
block
=
nlmsvc_create_block
(
rqstp
,
nlm_get_host
(
host
),
file
,
block
=
nlmsvc_create_block
(
rqstp
,
nlm_get_host
(
host
),
file
,
lock
,
cookie
);
lock
,
cookie
);
ret
=
nlm_lck_denied_nolocks
;
ret
=
nlm_lck_denied_nolocks
;
if
(
block
==
NULL
)
if
(
block
==
NULL
)
goto
out
;
goto
out
;
...
@@ -412,7 +412,7 @@ nlmsvc_lock(struct svc_rqst *rqstp, struct nlm_file *file,
...
@@ -412,7 +412,7 @@ nlmsvc_lock(struct svc_rqst *rqstp, struct nlm_file *file,
lock
->
fl
.
fl_flags
&=
~
FL_SLEEP
;
lock
->
fl
.
fl_flags
&=
~
FL_SLEEP
;
dprintk
(
"lockd: vfs_lock_file returned %d
\n
"
,
error
);
dprintk
(
"lockd: vfs_lock_file returned %d
\n
"
,
error
);
switch
(
error
)
{
switch
(
error
)
{
case
0
:
case
0
:
ret
=
nlm_granted
;
ret
=
nlm_granted
;
goto
out
;
goto
out
;
...
@@ -880,7 +880,7 @@ nlmsvc_retry_blocked(void)
...
@@ -880,7 +880,7 @@ nlmsvc_retry_blocked(void)
if
(
block
->
b_when
==
NLM_NEVER
)
if
(
block
->
b_when
==
NLM_NEVER
)
break
;
break
;
if
(
time_after
(
block
->
b_when
,
jiffies
))
{
if
(
time_after
(
block
->
b_when
,
jiffies
))
{
timeout
=
block
->
b_when
-
jiffies
;
timeout
=
block
->
b_when
-
jiffies
;
break
;
break
;
}
}
...
...
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