diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2009-06-13 14:09:36 (GMT) |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2009-06-13 14:09:36 (GMT) |
| commit | 4ab2f15b7f709c3626a7eed075a7225b4c775c7e (patch) | |
| tree | bfefc592c4c2eb176162134c615132e75f810486 /fs/ext4/inode.c | |
| parent | bc0b0d6d69ee9022f18ae264e62beb30ddeb322a (diff) | |
| download | linux-4ab2f15b7f709c3626a7eed075a7225b4c775c7e.tar.xz | |
ext4: move the abort flag from s_mount_opts to s_mount_flags
We're running out of space in the mount options word, and
EXT4_MOUNT_ABORT isn't really a mount option, but a run-time flag. So
move it to become EXT4_MF_FS_ABORTED in s_mount_flags.
Also remove bogus ext2_fs.h / ext4.h simultaneous #include protection,
which can never happen.
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'fs/ext4/inode.c')
| -rw-r--r-- | fs/ext4/inode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index f8325a2..5f927f6 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -2670,13 +2670,13 @@ static int ext4_da_writepages(struct address_space *mapping, * If the filesystem has aborted, it is read-only, so return * right away instead of dumping stack traces later on that * will obscure the real source of the problem. We test - * EXT4_MOUNT_ABORT instead of sb->s_flag's MS_RDONLY because + * EXT4_MF_FS_ABORTED instead of sb->s_flag's MS_RDONLY because * the latter could be true if the filesystem is mounted * read-only, and in that case, ext4_da_writepages should * *never* be called, so if that ever happens, we would want * the stack trace. */ - if (unlikely(sbi->s_mount_opt & EXT4_MOUNT_ABORT)) + if (unlikely(sbi->s_mount_flags & EXT4_MF_FS_ABORTED)) return -EROFS; /* |