diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-04-16 15:20:06 +0200 | 
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-04-16 15:20:06 +0200 | 
| commit | cf0dbba515415bb19b11f9323d5f7bebd7f24fd6 (patch) | |
| tree | 375bbc1ade1a92acd6493d224dd701fd7f209014 /include/linux/ext3_fs.h | |
| parent | 1cff399ecd9125d8e6a634a1957be1aeb3195a12 (diff) | |
| parent | 0340c7dccd80d8706c636e030a6ebbddbddca690 (diff) | |
Merge remote branch 'alsa/devel' into topic/misc
Diffstat (limited to 'include/linux/ext3_fs.h')
| -rw-r--r-- | include/linux/ext3_fs.h | 6 | 
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/ext3_fs.h b/include/linux/ext3_fs.h index cac84b006667..5f494b465097 100644 --- a/include/linux/ext3_fs.h +++ b/include/linux/ext3_fs.h @@ -565,17 +565,17 @@ enum {  static inline int ext3_test_inode_state(struct inode *inode, int bit)  { -	return test_bit(bit, &EXT3_I(inode)->i_state); +	return test_bit(bit, &EXT3_I(inode)->i_state_flags);  }  static inline void ext3_set_inode_state(struct inode *inode, int bit)  { -	set_bit(bit, &EXT3_I(inode)->i_state); +	set_bit(bit, &EXT3_I(inode)->i_state_flags);  }  static inline void ext3_clear_inode_state(struct inode *inode, int bit)  { -	clear_bit(bit, &EXT3_I(inode)->i_state); +	clear_bit(bit, &EXT3_I(inode)->i_state_flags);  }  #else  /* Assume that user mode programs are passing in an ext3fs superblock, not  | 
