Page MenuHomeFreeBSD
Files F115416027

D36816.diff
No OneTemporary
Actions

D36816.diff
View Options

diff --git a/usr.sbin/rpc.lockd/lock_proc.c b/usr.sbin/rpc.lockd/lock_proc.c
--- a/usr.sbin/rpc.lockd/lock_proc.c
+++ b/usr.sbin/rpc.lockd/lock_proc.c
@@ -999,7 +999,7 @@
/* copy cookie from arg to result. See comment in nlm_test_4() */
res.cookie = arg->cookie;
- res.stat.stat = getlock(arg, rqstp, LOCK_MON | LOCK_V4);
+ res.stat.stat = (enum nlm4_stats)getlock(arg, rqstp, LOCK_MON | LOCK_V4);
return (&res);
}
@@ -1012,7 +1012,7 @@
log_from_addr("nlm4_lock_msg", rqstp);
res.cookie = arg->cookie;
- res.stat.stat = getlock(arg, rqstp, LOCK_MON | LOCK_ASYNC | LOCK_V4);
+ res.stat.stat = (enum nlm4_stats)getlock(arg, rqstp, LOCK_MON | LOCK_ASYNC | LOCK_V4);
transmit4_result(NLM4_LOCK_RES, &res, getrpcaddr(rqstp));
return (NULL);
@@ -1039,7 +1039,7 @@
* Since at present we never return 'nlm_blocked', there can never be
* a lock to cancel, so this call always fails.
*/
- res.stat.stat = unlock(&arg->alock, LOCK_CANCEL);
+ res.stat.stat = (enum nlm4_stats)unlock(&arg->alock, LOCK_CANCEL);
return (&res);
}
@@ -1056,7 +1056,7 @@
* Since at present we never return 'nlm_blocked', there can never be
* a lock to cancel, so this call always fails.
*/
- res.stat.stat = unlock(&arg->alock, LOCK_CANCEL | LOCK_V4);
+ res.stat.stat = (enum nlm4_stats)unlock(&arg->alock, LOCK_CANCEL | LOCK_V4);
transmit4_result(NLM4_CANCEL_RES, &res, getrpcaddr(rqstp));
return (NULL);
}
@@ -1077,7 +1077,7 @@
if (debug_level)
log_from_addr("nlm4_unlock", rqstp);
- res.stat.stat = unlock(&arg->alock, LOCK_V4);
+ res.stat.stat = (enum nlm4_stats)unlock(&arg->alock, LOCK_V4);
res.cookie = arg->cookie;
return (&res);
@@ -1091,7 +1091,7 @@
if (debug_level)
log_from_addr("nlm4_unlock_msg", rqstp);
- res.stat.stat = unlock(&arg->alock, LOCK_V4);
+ res.stat.stat = (enum nlm4_stats)unlock(&arg->alock, LOCK_V4);
res.cookie = arg->cookie;
transmit4_result(NLM4_UNLOCK_RES, &res, getrpcaddr(rqstp));

File Metadata

Mime Type
text/plain
Expires
Thu, Apr 24, 2:11 PM (12 h, 13 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
17760358
Default Alt Text
D36816.diff (1 KB)

Event Timeline