diff options
| author | Alex Elder <alex.elder@linaro.org> | 2014-01-23 15:53:59 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-23 16:36:54 -0800 |
| commit | 77719536dc00f8fd8f5abe6dadbde5331c37f996 (patch) | |
| tree | 4f5928d6fd32871cd05fdb0f35702028d6f6fcec /fs/reiserfs | |
| parent | a6ce7114eed4f2f56edcd02fc6dad019ba2c04fc (diff) | |
| download | linux-stable-77719536dc00f8fd8f5abe6dadbde5331c37f996.tar.gz linux-stable-77719536dc00f8fd8f5abe6dadbde5331c37f996.tar.bz2 linux-stable-77719536dc00f8fd8f5abe6dadbde5331c37f996.zip | |
conditionally define U32_MAX
The symbol U32_MAX is defined in several spots. Change these
definitions to be conditional. This is in preparation for the next
patch, which centralizes the definition in <linux/kernel.h>.
Signed-off-by: Alex Elder <elder@linaro.org>
Cc: Sage Weil <sage@inktank.com>
Cc: David Miller <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/reiserfs')
| -rw-r--r-- | fs/reiserfs/reiserfs.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/reiserfs/reiserfs.h b/fs/reiserfs/reiserfs.h index f8adaee537c2..66a2e832fa8d 100644 --- a/fs/reiserfs/reiserfs.h +++ b/fs/reiserfs/reiserfs.h @@ -1958,7 +1958,9 @@ struct treepath var = {.path_length = ILLEGAL_PATH_ELEMENT_OFFSET, .reada = 0,} #define MAX_US_INT 0xffff // reiserfs version 2 has max offset 60 bits. Version 1 - 32 bit offset +#ifndef U32_MAX #define U32_MAX (~(__u32)0) +#endif /* !U32_MAX */ static inline loff_t max_reiserfs_offset(struct inode *inode) { |