The patch titled
fs: reiser4, add parenths around !X & Y
has been removed from the -mm tree. Its filename was
fs-reiser4-add-parenths-around-x-y.patch
This patch was dropped because it was folded into reiser4.patch
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: fs: reiser4, add parenths around !X & Y
From: Jiri Slaby <jirislaby@xxxxxxxxx>
Change !X & Y to !(X & Y) to avoid compiler confusion and fix a bug.
Signed-off-by: Jiri Slaby <jirislaby@xxxxxxxxx>
Cc: Edward Shishkin <edward.shishkin@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/reiser4/carry_ops.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff -puN fs/reiser4/carry_ops.c~fs-reiser4-add-parenths-around-x-y fs/reiser4/carry_ops.c
--- a/fs/reiser4/carry_ops.c~fs-reiser4-add-parenths-around-x-y
+++ a/fs/reiser4/carry_ops.c
@@ -79,7 +79,7 @@ static carry_node *find_left_neighbor(ca
left->free = 1;
flags = GN_TRY_LOCK;
- if (!op->u.insert.flags & COPI_LOAD_LEFT)
+ if (!(op->u.insert.flags & COPI_LOAD_LEFT))
flags |= GN_NO_ALLOC;
/* then, feeling lucky, peek left neighbor in the cache. */
@@ -203,7 +203,7 @@ static carry_node *find_right_neighbor(c
read_unlock_tree(tree);
flags = GN_CAN_USE_UPPER_LEVELS;
- if (!op->u.insert.flags & COPI_LOAD_RIGHT)
+ if (!(op->u.insert.flags & COPI_LOAD_RIGHT))
flags = GN_NO_ALLOC;
/* then, try to lock right neighbor */
_
Patches currently in -mm which might be from jirislaby@xxxxxxxxx are
linux-next.patch
agp-amd64-fix-pci-reference-leaks.patch
isdn-misdn-dont-compile-unused-stuff.patch
reiser4.patch
fs-reiser4-add-parenths-around-x-y.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
