evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ext4: do not use ext4_error() when there is no space in dir leaf for csum

Browse source 
If there is no space for a checksum in a directory leaf node,
previously we would use EXT4_ERROR_INODE() which would mark the file
system as inconsistent.  While it would be nice to use e2fsck -D, it
certainly isn't required, so just print a warning using
ext4_warning().

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Cc: "Darrick J. Wong" <darrick.wong@oracle.com>
This commit is contained in:
Theodore Ts'o 2012-11-10 22:20:05 -05:00
parent c8c0df241c
commit dffe9d8da7
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
fs/ext4/namei.c
View file

@ -261,6 +261,12 @@ static __le32 ext4_dirent_csum(struct inode *inode,
return cpu_to_le32(csum); return cpu_to_le32(csum);
} }
static void warn_no_space_for_csum(struct inode *inode)
{
ext4_warning(inode->i_sb, "no space in directory inode %lu leaf for "
"checksum. Please run e2fsck -D.", inode->i_ino);
}
int ext4_dirent_csum_verify(struct inode *inode, struct ext4_dir_entry *dirent) int ext4_dirent_csum_verify(struct inode *inode, struct ext4_dir_entry *dirent)
{ {
struct ext4_dir_entry_tail *t; struct ext4_dir_entry_tail *t;
@ -271,8 +277,7 @@ int ext4_dirent_csum_verify(struct inode *inode, struct ext4_dir_entry *dirent)
t = get_dirent_tail(inode, dirent); t = get_dirent_tail(inode, dirent);
if (!t) { if (!t) {
EXT4_ERROR_INODE(inode, "metadata_csum set but no space in dir " warn_no_space_for_csum(inode);
"leaf for checksum. Please run e2fsck -D.");
return 0; return 0;
} }
@ -294,8 +299,7 @@ static void ext4_dirent_csum_set(struct inode *inode,
t = get_dirent_tail(inode, dirent); t = get_dirent_tail(inode, dirent);
if (!t) { if (!t) {
EXT4_ERROR_INODE(inode, "metadata_csum set but no space in dir " warn_no_space_for_csum(inode);
"leaf for checksum. Please run e2fsck -D.");
return; return;
} }
@ -377,8 +381,7 @@ static int ext4_dx_csum_verify(struct inode *inode,
count = le16_to_cpu(c->count); count = le16_to_cpu(c->count);
if (count_offset + (limit * sizeof(struct dx_entry)) > if (count_offset + (limit * sizeof(struct dx_entry)) >
EXT4_BLOCK_SIZE(inode->i_sb) - sizeof(struct dx_tail)) { EXT4_BLOCK_SIZE(inode->i_sb) - sizeof(struct dx_tail)) {
EXT4_ERROR_INODE(inode, "metadata_csum set but no space for " warn_no_space_for_csum(inode);
"tree checksum found. Run e2fsck -D.");
return 1; return 1;
} }
t = (struct dx_tail *)(((struct dx_entry *)c) + limit); t = (struct dx_tail *)(((struct dx_entry *)c) + limit);
@ -408,8 +411,7 @@ static void ext4_dx_csum_set(struct inode *inode, struct ext4_dir_entry *dirent)
count = le16_to_cpu(c->count); count = le16_to_cpu(c->count);
if (count_offset + (limit * sizeof(struct dx_entry)) > if (count_offset + (limit * sizeof(struct dx_entry)) >
EXT4_BLOCK_SIZE(inode->i_sb) - sizeof(struct dx_tail)) { EXT4_BLOCK_SIZE(inode->i_sb) - sizeof(struct dx_tail)) {
EXT4_ERROR_INODE(inode, "metadata_csum set but no space for " warn_no_space_for_csum(inode);
"tree checksum. Run e2fsck -D.");
return; return;
} }
t = (struct dx_tail *)(((struct dx_entry *)c) + limit); t = (struct dx_tail *)(((struct dx_entry *)c) + limit);