diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-01 12:01:10 -0700 | 
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-01 12:01:10 -0700 | 
| commit | ef99f3aee9641d10a7c80d4803d2f0f004c797ca (patch) | |
| tree | 83f14ccef66db48fc4178bd8b973462006de86b8 /fs/ext4/extents_status.h | |
| parent | cb06ff102e2d79a82cf780aa5e6947b2e0529ac0 (diff) | |
| parent | 07961ac7c0ee8b546658717034fe692fd12eefa9 (diff) | |
| download | olio-linux-3.10-ef99f3aee9641d10a7c80d4803d2f0f004c797ca.tar.xz olio-linux-3.10-ef99f3aee9641d10a7c80d4803d2f0f004c797ca.zip  | |
Merge 3.9-rc5 into tty-next
We need the fixes here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/ext4/extents_status.h')
| -rw-r--r-- | fs/ext4/extents_status.h | 9 | 
1 files changed, 9 insertions, 0 deletions
diff --git a/fs/ext4/extents_status.h b/fs/ext4/extents_status.h index f190dfe969d..d8e2d4dc311 100644 --- a/fs/ext4/extents_status.h +++ b/fs/ext4/extents_status.h @@ -21,6 +21,12 @@  #endif  /* + * With ES_AGGRESSIVE_TEST defined, the result of es caching will be + * checked with old map_block's result. + */ +#define ES_AGGRESSIVE_TEST__ + +/*   * These flags live in the high bits of extent_status.es_pblk   */  #define EXTENT_STATUS_WRITTEN	(1ULL << 63) @@ -33,6 +39,8 @@  				 EXTENT_STATUS_DELAYED | \  				 EXTENT_STATUS_HOLE) +struct ext4_extent; +  struct extent_status {  	struct rb_node rb_node;  	ext4_lblk_t es_lblk;	/* first logical block extent covers */ @@ -58,6 +66,7 @@ extern void ext4_es_find_delayed_extent(struct inode *inode, ext4_lblk_t lblk,  					struct extent_status *es);  extern int ext4_es_lookup_extent(struct inode *inode, ext4_lblk_t lblk,  				 struct extent_status *es); +extern int ext4_es_zeroout(struct inode *inode, struct ext4_extent *ex);  static inline int ext4_es_is_written(struct extent_status *es)  {  |