git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
[pandora-kernel.git]
/
fs
/
ext4
/
ext4_jbd2.h
diff --git
a/fs/ext4/ext4_jbd2.h
b/fs/ext4/ext4_jbd2.h
index
b79ad51
..
dade0c0
100644
(file)
--- a/
fs/ext4/ext4_jbd2.h
+++ b/
fs/ext4/ext4_jbd2.h
@@
-273,7
+273,7
@@
static inline int ext4_should_journal_data(struct inode *inode)
return 1;
if (test_opt(inode->i_sb, DATA_FLAGS) == EXT4_MOUNT_JOURNAL_DATA)
return 1;
return 1;
if (test_opt(inode->i_sb, DATA_FLAGS) == EXT4_MOUNT_JOURNAL_DATA)
return 1;
- if (
EXT4_I(inode)->i_flags & EXT4_JOURNAL_DATA_FL
)
+ if (
ext4_test_inode_flag(inode, EXT4_INODE_JOURNAL_DATA)
)
return 1;
return 0;
}
return 1;
return 0;
}
@@
-284,7
+284,7
@@
static inline int ext4_should_order_data(struct inode *inode)
return 0;
if (!S_ISREG(inode->i_mode))
return 0;
return 0;
if (!S_ISREG(inode->i_mode))
return 0;
- if (
EXT4_I(inode)->i_flags & EXT4_JOURNAL_DATA_FL
)
+ if (
ext4_test_inode_flag(inode, EXT4_INODE_JOURNAL_DATA)
)
return 0;
if (test_opt(inode->i_sb, DATA_FLAGS) == EXT4_MOUNT_ORDERED_DATA)
return 1;
return 0;
if (test_opt(inode->i_sb, DATA_FLAGS) == EXT4_MOUNT_ORDERED_DATA)
return 1;
@@
-297,7
+297,7
@@
static inline int ext4_should_writeback_data(struct inode *inode)
return 0;
if (EXT4_JOURNAL(inode) == NULL)
return 1;
return 0;
if (EXT4_JOURNAL(inode) == NULL)
return 1;
- if (
EXT4_I(inode)->i_flags & EXT4_JOURNAL_DATA_FL
)
+ if (
ext4_test_inode_flag(inode, EXT4_INODE_JOURNAL_DATA)
)
return 0;
if (test_opt(inode->i_sb, DATA_FLAGS) == EXT4_MOUNT_WRITEBACK_DATA)
return 1;
return 0;
if (test_opt(inode->i_sb, DATA_FLAGS) == EXT4_MOUNT_WRITEBACK_DATA)
return 1;
@@
-321,7
+321,7
@@
static inline int ext4_should_dioread_nolock(struct inode *inode)
return 0;
if (!S_ISREG(inode->i_mode))
return 0;
return 0;
if (!S_ISREG(inode->i_mode))
return 0;
- if (!(
EXT4_I(inode)->i_flags & EXT4_EXTENTS_FL
))
+ if (!(
ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS)
))
return 0;
if (ext4_should_journal_data(inode))
return 0;
return 0;
if (ext4_should_journal_data(inode))
return 0;