From f6bf1abc1b2a78ec6a955315b4be1f3061091007 Mon Sep 17 00:00:00 2001 From: "Andrey A. Chernov" Date: Thu, 23 Aug 2001 18:02:29 +0000 Subject: [PATCH] Stupid error from my side in prev. commit: || -> && --- sys/nfs/nfs_lock.c | 2 +- sys/nfsclient/nfs_lock.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/nfs/nfs_lock.c b/sys/nfs/nfs_lock.c index 607662c6213..e2fa91c1db5 100644 --- a/sys/nfs/nfs_lock.c +++ b/sys/nfs/nfs_lock.c @@ -103,7 +103,7 @@ nfs_dolock(ap) * on ranges, so we do it. */ if (fl->l_whence != SEEK_END) { - if (fl->l_whence != SEEK_CUR || fl->l_whence != SEEK_SET || + if ((fl->l_whence != SEEK_CUR && fl->l_whence != SEEK_SET) || fl->l_start < 0 || (fl->l_len < 0 && (fl->l_start == 0 || fl->l_start + fl->l_len < 0))) diff --git a/sys/nfsclient/nfs_lock.c b/sys/nfsclient/nfs_lock.c index 607662c6213..e2fa91c1db5 100644 --- a/sys/nfsclient/nfs_lock.c +++ b/sys/nfsclient/nfs_lock.c @@ -103,7 +103,7 @@ nfs_dolock(ap) * on ranges, so we do it. */ if (fl->l_whence != SEEK_END) { - if (fl->l_whence != SEEK_CUR || fl->l_whence != SEEK_SET || + if ((fl->l_whence != SEEK_CUR && fl->l_whence != SEEK_SET) || fl->l_start < 0 || (fl->l_len < 0 && (fl->l_start == 0 || fl->l_start + fl->l_len < 0)))