diff options
Diffstat (limited to 'net/unix/garbage.c')
| -rw-r--r-- | net/unix/garbage.c | 12 | 
1 files changed, 6 insertions, 6 deletions
| diff --git a/net/unix/garbage.c b/net/unix/garbage.c index d0f6545b001..9bc73f87f64 100644 --- a/net/unix/garbage.c +++ b/net/unix/garbage.c @@ -185,7 +185,7 @@ static void scan_inflight(struct sock *x, void (*func)(struct unix_sock *),  					 * have been added to the queues after  					 * starting the garbage collection  					 */ -					if (u->gc_candidate) { +					if (test_bit(UNIX_GC_CANDIDATE, &u->gc_flags)) {  						hit = true;  						func(u);  					} @@ -254,7 +254,7 @@ static void inc_inflight_move_tail(struct unix_sock *u)  	 * of the list, so that it's checked even if it was already  	 * passed over  	 */ -	if (u->gc_maybe_cycle) +	if (test_bit(UNIX_GC_MAYBE_CYCLE, &u->gc_flags))  		list_move_tail(&u->link, &gc_candidates);  } @@ -315,8 +315,8 @@ void unix_gc(void)  		BUG_ON(total_refs < inflight_refs);  		if (total_refs == inflight_refs) {  			list_move_tail(&u->link, &gc_candidates); -			u->gc_candidate = 1; -			u->gc_maybe_cycle = 1; +			__set_bit(UNIX_GC_CANDIDATE, &u->gc_flags); +			__set_bit(UNIX_GC_MAYBE_CYCLE, &u->gc_flags);  		}  	} @@ -344,7 +344,7 @@ void unix_gc(void)  		if (atomic_long_read(&u->inflight) > 0) {  			list_move_tail(&u->link, ¬_cycle_list); -			u->gc_maybe_cycle = 0; +			__clear_bit(UNIX_GC_MAYBE_CYCLE, &u->gc_flags);  			scan_children(&u->sk, inc_inflight_move_tail, NULL);  		}  	} @@ -356,7 +356,7 @@ void unix_gc(void)  	 */  	while (!list_empty(¬_cycle_list)) {  		u = list_entry(not_cycle_list.next, struct unix_sock, link); -		u->gc_candidate = 0; +		__clear_bit(UNIX_GC_CANDIDATE, &u->gc_flags);  		list_move_tail(&u->link, &gc_inflight_list);  	} | 
