diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-26 10:29:21 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-26 10:29:21 -0700 |
| commit | 1c23de630886e423ab298bce32a71486577bda5d (patch) | |
| tree | 13fd26c68541a6a17c47f2a08f8b2bbc9508fb2a /fs/ext4/move_extent.c | |
| parent | a643f9054c21f4fae0fbb4add663462fea7a47f0 (diff) | |
| parent | d67d64f423147cf4fe8212658255e1160a4ef02c (diff) | |
| download | linux-1c23de630886e423ab298bce32a71486577bda5d.tar.gz linux-1c23de630886e423ab298bce32a71486577bda5d.tar.bz2 linux-1c23de630886e423ab298bce32a71486577bda5d.zip | |
Merge tag 'ext4_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
Pull ext4 fixes from Ted Ts'o:
"Fix a memory leak on an error path, and two races when modifying
inodes relating to the inline_data and metadata checksum features"
* tag 'ext4_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
ext4: fix two spelling nits
ext4: lock the xattr block before checksuming it
jbd2: don't leak memory if setting up journal fails
ext4: mark inode dirty after converting inline directory
Diffstat (limited to 'fs/ext4/move_extent.c')
| -rw-r--r-- | fs/ext4/move_extent.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext4/move_extent.c b/fs/ext4/move_extent.c index 578f8c33fb44..c992ef2c2f94 100644 --- a/fs/ext4/move_extent.c +++ b/fs/ext4/move_extent.c @@ -511,7 +511,7 @@ mext_check_arguments(struct inode *orig_inode, if ((orig_start & ~(PAGE_MASK >> orig_inode->i_blkbits)) != (donor_start & ~(PAGE_MASK >> orig_inode->i_blkbits))) { ext4_debug("ext4 move extent: orig and donor's start " - "offset are not alligned [ino:orig %lu, donor %lu]\n", + "offsets are not aligned [ino:orig %lu, donor %lu]\n", orig_inode->i_ino, donor_inode->i_ino); return -EINVAL; } |