VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)

[linux-2.6.git] / fs / lockd / svclock.c

diff --git a/fs/lockd/svclock.c b/fs/lockd/svclock.c
index d963190..2addc92 100644 (file)
--- a/fs/lockd/svclock.c
+++ b/fs/lockd/svclock.c
@@ -67,7 +67,7 @@ nlmsvc_insert_block(struct nlm_block *block, unsigned long when)
                while ((b = *bp) && time_before_eq(b->b_when,when) && b->b_when != NLM_NEVER)
                        bp = &b->b_next;
        } else
-               while ((b = *bp))
+               while ((b = *bp) != 0)
                        bp = &b->b_next;
 
        block->b_queued = 1;
@@ -86,7 +86,7 @@ nlmsvc_remove_block(struct nlm_block *block)
 
        if (!block->b_queued)
                return 1;
-       for (bp = &nlm_blocked; (b = *bp); bp = &b->b_next) {
+       for (bp = &nlm_blocked; (b = *bp) != 0; bp = &b->b_next) {
                if (b == block) {
                        *bp = block->b_next;
                        block->b_queued = 0;
@@ -111,7 +111,7 @@ nlmsvc_lookup_block(struct nlm_file *file, struct nlm_lock *lock, int remove)
                                file, lock->fl.fl_pid,
                                (long long)lock->fl.fl_start,
                                (long long)lock->fl.fl_end, lock->fl.fl_type);
-       for (head = &nlm_blocked; (block = *head); head = &block->b_next) {
+       for (head = &nlm_blocked; (block = *head) != 0; head = &block->b_next) {
                fl = &block->b_call.a_args.lock.fl;
                dprintk("lockd: check f=%p pd=%d %Ld-%Ld ty=%d cookie=%x\n",
                                block->b_file, fl->fl_pid,
@@ -468,7 +468,7 @@ nlmsvc_notify_blocked(struct file_lock *fl)
        struct nlm_block        **bp, *block;
 
        dprintk("lockd: VFS unblock notification for block %p\n", fl);
-       for (bp = &nlm_blocked; (block = *bp); bp = &block->b_next) {
+       for (bp = &nlm_blocked; (block = *bp) != 0; bp = &block->b_next) {
                if (nlm_compare_locks(&block->b_call.a_args.lock.fl, fl)) {
                        nlmsvc_insert_block(block, 0);
                        svc_wake_up(block->b_daemon);
@@ -653,7 +653,7 @@ nlmsvc_retry_blocked(void)
        dprintk("nlmsvc_retry_blocked(%p, when=%ld)\n",
                        nlm_blocked,
                        nlm_blocked? nlm_blocked->b_when : 0);
-       while ((block = nlm_blocked)) {
+       while ((block = nlm_blocked) != 0) {
                if (block->b_when == NLM_NEVER)
                        break;
                if (time_after(block->b_when,jiffies))