summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey A. Chernov <ache@FreeBSD.org>2001-08-26 10:28:58 +0000
committerAndrey A. Chernov <ache@FreeBSD.org>2001-08-26 10:28:58 +0000
commitfcbe9614efd3bbf67477b59f2e7680f5f170b1ef (patch)
tree99d915f89d33f8d80eaba05802b6b764514c083e
parentc4778eed9faaad53d320a96c55741f4a5331e57a (diff)
Notes
-rw-r--r--sys/fs/smbfs/smbfs_vnops.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/sys/fs/smbfs/smbfs_vnops.c b/sys/fs/smbfs/smbfs_vnops.c
index 3ca217f306ea..6139351f91af 100644
--- a/sys/fs/smbfs/smbfs_vnops.c
+++ b/sys/fs/smbfs/smbfs_vnops.c
@@ -977,7 +977,7 @@ smbfs_advlock(ap)
struct proc *p = curproc;
struct smb_cred scred;
u_quad_t size;
- off_t start, end;
+ off_t start, end, oadd;
int error, lkop;
if (vp->v_type == VDIR) {
@@ -997,7 +997,6 @@ smbfs_advlock(ap)
start = fl->l_start;
break;
case SEEK_END:
- /* 'size' is always >= 0 */
if ((fl->l_start > 0 && size > OFF_MAX - fl->l_start) ||
(fl->l_start < 0 && size + fl->l_start > OFF_MAX))
return EOVERFLOW;
@@ -1018,9 +1017,7 @@ smbfs_advlock(ap)
} else if (fl->l_len == 0)
end = -1;
else {
- off_t oadd = fl->l_len - 1;
-
- /* 'oadd' and 'start' are >= 0 */
+ oadd = fl->l_len - 1;
if (oadd > OFF_MAX - start)
return EOVERFLOW;
end = start + oadd;