diff options
| author | Greg Kroah-Hartman <gregkh@google.com> | 2021-03-24 11:22:11 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@google.com> | 2021-03-24 11:22:11 +0100 |
| commit | ff91fba478b0b7e2b81b13de25e9a226f1daf296 (patch) | |
| tree | 328d3052ba44bdf361568b198782b3ba9dc81575 /fs/ext4/ext4.h | |
| parent | 901297f61843b004aa3b39e28c53b89f586896d5 (diff) | |
| parent | 4d422f6e1358d7eb9f493ec832e8cf0b8e6bc28d (diff) | |
Merge 4.4.263 into android-4.4-p
Changes in 4.4.263
ext4: handle error of ext4_setup_system_zone() on remount
ext4: don't allow overlapping system zones
ext4: check journal inode extents more carefully
platform/chrome: cros_ec_dev - Fix security issue
btrfs: fix race when cloning extent buffer during rewind of an old root
NFSD: Repair misuse of sv_lock in 5.10.16-rt30.
scsi: lpfc: Fix some error codes in debugfs
USB: replace hardcode maximum usb string length by definition
usb: gadget: configfs: Fix KASAN use-after-free
PCI: rpadlpar: Fix potential drc_name corruption in store functions
x86/ioapic: Ignore IRQ2 again
ext4: find old entry again if failed to rename whiteout
ext4: fix potential error in ext4_do_update_inode
genirq: Disable interrupts for force threaded handlers
Linux 4.4.263
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I2f08b8f294218dd5ef2df6f13ca83f43a8728a28
Diffstat (limited to 'fs/ext4/ext4.h')
| -rw-r--r-- | fs/ext4/ext4.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index 9f6c259fc83f..6998e3eaab4c 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h @@ -3137,9 +3137,9 @@ extern void ext4_release_system_zone(struct super_block *sb); extern int ext4_setup_system_zone(struct super_block *sb); extern int __init ext4_init_system_zone(void); extern void ext4_exit_system_zone(void); -extern int ext4_data_block_valid(struct ext4_sb_info *sbi, - ext4_fsblk_t start_blk, - unsigned int count); +extern int ext4_inode_block_valid(struct inode *inode, + ext4_fsblk_t start_blk, + unsigned int count); extern int ext4_check_blockref(const char *, unsigned int, struct inode *, __le32 *, unsigned int); |