From mboxrd@z Thu Jan 1 00:00:00 1970 From: Namhyung Kim Subject: [PATCH] fs/buffer.c: change buffer_busy() to use logical-OR expression Date: Sun, 24 Oct 2010 02:06:15 +0900 Message-ID: <1287853575-14190-1-git-send-email-namhyung@gmail.com> Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org To: Alexander Viro Return-path: Sender: linux-kernel-owner@vger.kernel.org List-Id: linux-fsdevel.vger.kernel.org Convert bitwise-OR operator to logical-OR in favor of short-circuit evaluation. The end result would be same. Signed-off-by: Namhyung Kim --- fs/buffer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/fs/buffer.c b/fs/buffer.c index f5755f7..4362e77 100644 --- a/fs/buffer.c +++ b/fs/buffer.c @@ -3069,7 +3069,7 @@ EXPORT_SYMBOL(sync_dirty_buffer); */ static inline int buffer_busy(struct buffer_head *bh) { - return atomic_read(&bh->b_count) | + return atomic_read(&bh->b_count) || (bh->b_state & ((1 << BH_Dirty) | (1 << BH_Lock))); } -- 1.7.0.4