git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
fs
/
lockd
/
xdr.c
diff --git
a/fs/lockd/xdr.c
b/fs/lockd/xdr.c
index
5d4b339
..
a76c496
100644
(file)
--- a/
fs/lockd/xdr.c
+++ b/
fs/lockd/xdr.c
@@
-190,7
+190,7
@@
nlm_encode_testres(u32 *p, struct nlm_res *resp)
s32 start, len;
if (!(p = nlm_encode_cookie(p, &resp->cookie)))
s32 start, len;
if (!(p = nlm_encode_cookie(p, &resp->cookie)))
- return
0
;
+ return
NULL
;
*p++ = resp->status;
if (resp->status == nlm_lck_denied) {
*p++ = resp->status;
if (resp->status == nlm_lck_denied) {
@@
-201,7
+201,7
@@
nlm_encode_testres(u32 *p, struct nlm_res *resp)
/* Encode owner handle. */
if (!(p = xdr_encode_netobj(p, &resp->lock.oh)))
/* Encode owner handle. */
if (!(p = xdr_encode_netobj(p, &resp->lock.oh)))
- return
0
;
+ return
NULL
;
start = loff_t_to_s32(fl->fl_start);
if (fl->fl_end == OFFSET_MAX)
start = loff_t_to_s32(fl->fl_start);
if (fl->fl_end == OFFSET_MAX)