aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ext4/ialloc.c
diff options
context:
space:
mode:
authorEric Sandeen <sandeen@redhat.com>2008-07-11 19:27:31 -0400
committerTheodore Ts'o <tytso@mit.edu>2008-07-11 19:27:31 -0400
commite4079a11f5ed966b7d972cc69e8d337a0f095e32 (patch)
tree1e70276654b4808cfcde549c7f2612947e5ab1c3 /fs/ext4/ialloc.c
parentc07651b556323e0e763c452587fe29d2b034b314 (diff)
ext4: do not set extents feature from the kernel
We've talked for a while about getting rid of any feature- setting from the kernel; this gets rid of the code which would set the INCOMPAT_EXTENTS flag on the first file write when mounted as ext4[dev]. With this patch, if the extents feature is not already set on disk, then mounting as ext4 will fall back to noextents with a warning, and if -o extents is explicitly requested, the mount will fail, also with warning. Signed-off-by: Eric Sandeen <sandeen@redhat.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'fs/ext4/ialloc.c')
-rw-r--r--fs/ext4/ialloc.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/fs/ext4/ialloc.c b/fs/ext4/ialloc.c
index 8b0a10acd708..a92eb305344f 100644
--- a/fs/ext4/ialloc.c
+++ b/fs/ext4/ialloc.c
@@ -836,14 +836,10 @@ got:
836 goto fail_free_drop; 836 goto fail_free_drop;
837 837
838 if (test_opt(sb, EXTENTS)) { 838 if (test_opt(sb, EXTENTS)) {
839 /* set extent flag only for diretory, file and normal symlink*/ 839 /* set extent flag only for directory, file and normal symlink*/
840 if (S_ISDIR(mode) || S_ISREG(mode) || S_ISLNK(mode)) { 840 if (S_ISDIR(mode) || S_ISREG(mode) || S_ISLNK(mode)) {
841 EXT4_I(inode)->i_flags |= EXT4_EXTENTS_FL; 841 EXT4_I(inode)->i_flags |= EXT4_EXTENTS_FL;
842 ext4_ext_tree_init(handle, inode); 842 ext4_ext_tree_init(handle, inode);
843 err = ext4_update_incompat_feature(handle, sb,
844 EXT4_FEATURE_INCOMPAT_EXTENTS);
845 if (err)
846 goto fail_free_drop;
847 } 843 }
848 } 844 }
849 845