summaryrefslogtreecommitdiff
path: root/fs/ext4
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-02-27 12:22:30 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2013-02-27 12:22:30 -0800
commit7bf2fbcdf5300d8b19fa36e37b5bcd8326c95c1d (patch)
tree8b93ecf5b8eabdd873052d6330cccb011005456e /fs/ext4
parentadf96e6f514a9e87aa3d26c8c9c03eca5be53df0 (diff)
parent8e919d13048cd5acaadb2b15b48acbfb8832d3c2 (diff)
Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
Pull ext4 regression fix from Theodore Ts'o: "This fixes a real brown paper bag bug which causes ext4 to choke on file systems larger than 512GB." * tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: ext4: fix extent status tree regression for file systems > 512GB
Diffstat (limited to 'fs/ext4')
-rw-r--r--fs/ext4/extents_status.h19
1 files changed, 11 insertions, 8 deletions
diff --git a/fs/ext4/extents_status.h b/fs/ext4/extents_status.h
index cf83e77b16cb..f190dfe969da 100644
--- a/fs/ext4/extents_status.h
+++ b/fs/ext4/extents_status.h
@@ -20,10 +20,13 @@
#define es_debug(fmt, ...) no_printk(fmt, ##__VA_ARGS__)
#endif
-#define EXTENT_STATUS_WRITTEN 0x80000000 /* written extent */
-#define EXTENT_STATUS_UNWRITTEN 0x40000000 /* unwritten extent */
-#define EXTENT_STATUS_DELAYED 0x20000000 /* delayed extent */
-#define EXTENT_STATUS_HOLE 0x10000000 /* hole */
+/*
+ * These flags live in the high bits of extent_status.es_pblk
+ */
+#define EXTENT_STATUS_WRITTEN (1ULL << 63)
+#define EXTENT_STATUS_UNWRITTEN (1ULL << 62)
+#define EXTENT_STATUS_DELAYED (1ULL << 61)
+#define EXTENT_STATUS_HOLE (1ULL << 60)
#define EXTENT_STATUS_FLAGS (EXTENT_STATUS_WRITTEN | \
EXTENT_STATUS_UNWRITTEN | \
@@ -58,22 +61,22 @@ extern int ext4_es_lookup_extent(struct inode *inode, ext4_lblk_t lblk,
static inline int ext4_es_is_written(struct extent_status *es)
{
- return (es->es_pblk & EXTENT_STATUS_WRITTEN);
+ return (es->es_pblk & EXTENT_STATUS_WRITTEN) != 0;
}
static inline int ext4_es_is_unwritten(struct extent_status *es)
{
- return (es->es_pblk & EXTENT_STATUS_UNWRITTEN);
+ return (es->es_pblk & EXTENT_STATUS_UNWRITTEN) != 0;
}
static inline int ext4_es_is_delayed(struct extent_status *es)
{
- return (es->es_pblk & EXTENT_STATUS_DELAYED);
+ return (es->es_pblk & EXTENT_STATUS_DELAYED) != 0;
}
static inline int ext4_es_is_hole(struct extent_status *es)
{
- return (es->es_pblk & EXTENT_STATUS_HOLE);
+ return (es->es_pblk & EXTENT_STATUS_HOLE) != 0;
}
static inline ext4_fsblk_t ext4_es_status(struct extent_status *es)