git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
[safe/jmp/linux-2.6]
/
fs
/
ext4
/
migrate.c
diff --git
a/fs/ext4/migrate.c
b/fs/ext4/migrate.c
index
34dcfc5
..
6f3a27e
100644
(file)
--- a/
fs/ext4/migrate.c
+++ b/
fs/ext4/migrate.c
@@
-475,7
+475,7
@@
int ext4_ext_migrate(struct inode *inode)
*/
if (!EXT4_HAS_INCOMPAT_FEATURE(inode->i_sb,
EXT4_FEATURE_INCOMPAT_EXTENTS) ||
*/
if (!EXT4_HAS_INCOMPAT_FEATURE(inode->i_sb,
EXT4_FEATURE_INCOMPAT_EXTENTS) ||
- (
EXT4_I(inode)->i_flags & EXT4_EXTENTS_FL
))
+ (
ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS)
))
return -EINVAL;
if (S_ISLNK(inode->i_mode) && inode->i_blocks == 0)
return -EINVAL;
if (S_ISLNK(inode->i_mode) && inode->i_blocks == 0)