From ec2a50425beaf994938609c893896fc5e2fe03e0 Mon Sep 17 00:00:00 2001
From: Roel Kluin <12o3l@tiscali.nl>
Date: Sat, 27 Oct 2007 00:20:36 +0200
Subject: [PATCH] --- yaml --- r: 73295 b: refs/heads/master c:
 3cf0c507dd28de0e1a4c24304d806e6b3976f0f5 h: refs/heads/master i:   73293:
 61242189c795887e29d7312f52e8f39fdc60e64b   73291:
 750bda73e2d032f086db27b03e8d7bede9fb76f8   73287:
 6423d841807869fbb5fe039641d403e99de8d7b7   73279:
 b86e4a2f8bac0ecdf0fbcf855b786b3885024942 v: v3

---
 [refs]                   | 2 +-
 trunk/fs/ocfs2/alloc.c   | 2 +-
 trunk/fs/ocfs2/dlmglue.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 48d81f7739e9..ebd38cc8b385 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0af4bd38876416d945ad6a1338798696604952a1
+refs/heads/master: 3cf0c507dd28de0e1a4c24304d806e6b3976f0f5
diff --git a/trunk/fs/ocfs2/alloc.c b/trunk/fs/ocfs2/alloc.c
index 4ba7f0bdc248..ce62c152823d 100644
--- a/trunk/fs/ocfs2/alloc.c
+++ b/trunk/fs/ocfs2/alloc.c
@@ -3946,7 +3946,7 @@ static int __ocfs2_mark_extent_written(struct inode *inode,
 	struct ocfs2_merge_ctxt ctxt;
 	struct ocfs2_extent_list *rightmost_el;
 
-	if (!rec->e_flags & OCFS2_EXT_UNWRITTEN) {
+	if (!(rec->e_flags & OCFS2_EXT_UNWRITTEN)) {
 		ret = -EIO;
 		mlog_errno(ret);
 		goto out;
diff --git a/trunk/fs/ocfs2/dlmglue.c b/trunk/fs/ocfs2/dlmglue.c
index 41c76ff2fcfb..ef09fd20f3a5 100644
--- a/trunk/fs/ocfs2/dlmglue.c
+++ b/trunk/fs/ocfs2/dlmglue.c
@@ -670,7 +670,7 @@ static inline void ocfs2_generic_handle_attach_action(struct ocfs2_lock_res *loc
 {
 	mlog_entry_void();
 
-	BUG_ON((!lockres->l_flags & OCFS2_LOCK_BUSY));
+	BUG_ON((!(lockres->l_flags & OCFS2_LOCK_BUSY)));
 	BUG_ON(lockres->l_flags & OCFS2_LOCK_ATTACHED);
 
 	if (lockres->l_requested > LKM_NLMODE &&