Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux...

[pandora-kernel.git] / include / linux / ext3_fs.h

diff --git a/include/linux/ext3_fs.h b/include/linux/ext3_fs.h
index 0c473fd..67a803a 100644 (file)
--- a/include/linux/ext3_fs.h
+++ b/include/linux/ext3_fs.h
@@ -418,12 +418,11 @@ struct ext3_inode {
 #define EXT2_MOUNT_DATA_FLAGS          EXT3_MOUNT_DATA_FLAGS
 #endif
 
-#define ext3_set_bit                   __test_and_set_bit_le
+#define ext3_set_bit                   __set_bit_le
 #define ext3_set_bit_atomic            ext2_set_bit_atomic
-#define ext3_clear_bit                 __test_and_clear_bit_le
+#define ext3_clear_bit                 __clear_bit_le
 #define ext3_clear_bit_atomic          ext2_clear_bit_atomic
 #define ext3_test_bit                  test_bit_le
-#define ext3_find_first_zero_bit       find_first_zero_bit_le
 #define ext3_find_next_zero_bit                find_next_zero_bit_le
 
 /*
@@ -913,7 +912,7 @@ extern void ext3_dirty_inode(struct inode *, int);
 extern int ext3_change_inode_journal_flag(struct inode *, int);
 extern int ext3_get_inode_loc(struct inode *, struct ext3_iloc *);
 extern int ext3_can_truncate(struct inode *inode);
-extern void ext3_truncate (struct inode *);
+extern void ext3_truncate(struct inode *inode);
 extern void ext3_set_inode_flags(struct inode *);
 extern void ext3_get_inode_flags(struct ext3_inode_info *);
 extern void ext3_set_aops(struct inode *inode);