diff options
| author | James Simmons <jsimmons@infradead.org> | 2012-11-14 18:15:32 +0000 |
|---|---|---|
| committer | James Simmons <jsimmons@infradead.org> | 2012-11-14 18:15:32 +0000 |
| commit | b44959f2817032bc4668434bbe1cf9ab28b8cb21 (patch) | |
| tree | de3bd861b36c836ac9b7b6e8dc179ca1985b6593 /fs/ubifs/find.c | |
| parent | e22956a2faa9cf34cec4a471131d50c6be75b0c2 (diff) | |
| parent | 2216c9e74fb3baac3cb73952158dbe38b703997e (diff) | |
Conflicts:
drivers/gpu/drm/tdfx/tdfx_drv.c
Diffstat (limited to 'fs/ubifs/find.c')
| -rw-r--r-- | fs/ubifs/find.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ubifs/find.c b/fs/ubifs/find.c index 2559d174e00..28ec13af28d 100644 --- a/fs/ubifs/find.c +++ b/fs/ubifs/find.c @@ -939,8 +939,8 @@ static int find_dirtiest_idx_leb(struct ubifs_info *c) } dbg_find("LEB %d, dirty %d and free %d flags %#x", lp->lnum, lp->dirty, lp->free, lp->flags); - ubifs_assert(lp->flags | LPROPS_TAKEN); - ubifs_assert(lp->flags | LPROPS_INDEX); + ubifs_assert(lp->flags & LPROPS_TAKEN); + ubifs_assert(lp->flags & LPROPS_INDEX); return lnum; } |