diff options
author | Huacai Chen <chenhc@lemote.com> | 2017-11-24 15:14:25 -0800 |
---|---|---|
committer | Jens Axboe <axboe@kernel.dk> | 2017-11-24 16:22:58 -0700 |
commit | cf33c1ee5254c6a430bc1538232b49c3ea13e613 (patch) | |
tree | 0318204e26ecf0913cbd7587e198828451d58a31 /drivers/md/bcache/extents.c | |
parent | bb22cafd75686d799dabfe422571fac4b5c2ed94 (diff) | |
download | linux-stable-cf33c1ee5254c6a430bc1538232b49c3ea13e613.tar.gz linux-stable-cf33c1ee5254c6a430bc1538232b49c3ea13e613.tar.bz2 linux-stable-cf33c1ee5254c6a430bc1538232b49c3ea13e613.zip |
bcache: Fix building error on MIPS
This patch try to fix the building error on MIPS. The reason is MIPS
has already defined the PTR macro, which conflicts with the PTR macro
in include/uapi/linux/bcache.h.
[fixed by mlyle: corrected a line-length issue]
Cc: stable@vger.kernel.org
Signed-off-by: Huacai Chen <chenhc@lemote.com>
Reviewed-by: Michael Lyle <mlyle@lyle.org>
Signed-off-by: Michael Lyle <mlyle@lyle.org>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/md/bcache/extents.c')
-rw-r--r-- | drivers/md/bcache/extents.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/md/bcache/extents.c b/drivers/md/bcache/extents.c index 41c238fc3733..f9d391711595 100644 --- a/drivers/md/bcache/extents.c +++ b/drivers/md/bcache/extents.c @@ -585,7 +585,7 @@ static bool bch_extent_merge(struct btree_keys *bk, struct bkey *l, struct bkey return false; for (i = 0; i < KEY_PTRS(l); i++) - if (l->ptr[i] + PTR(0, KEY_SIZE(l), 0) != r->ptr[i] || + if (l->ptr[i] + MAKE_PTR(0, KEY_SIZE(l), 0) != r->ptr[i] || PTR_BUCKET_NR(b->c, l, i) != PTR_BUCKET_NR(b->c, r, i)) return false; |