| Message ID | 64ab9d5449f6fb96bb8633f1a40cff14ddb5614e.1587555962.git.riteshh@linux.ibm.com |
|---|---|
| State | New |
| Headers | show |
| Series | ext4/overlayfs: fiemap related fixes | expand |
On Thu 23-04-20 16:17:54, Ritesh Harjani wrote: > This renames the fiemap_check_ranges() copy of function > within ext4/ioctl.c to become ext4_fiemap_check_ranges(). > This is required so that we can finally get rid of this > duplicate version. > Since overlayfs anyways need to use this in it's > ovl_fiemap() function, so later patches make it > available for use by others via EXPORT_SYMBOL. > > Signed-off-by: Ritesh Harjani <riteshh@linux.ibm.com> Looks good. You can add: Reviewed-by: Jan Kara <jack@suse.cz> Honza > --- > fs/ext4/ioctl.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c > index bfc1281fc4cb..76a2b5200ba3 100644 > --- a/fs/ext4/ioctl.c > +++ b/fs/ext4/ioctl.c > @@ -734,7 +734,7 @@ static void ext4_fill_fsxattr(struct inode *inode, struct fsxattr *fa) > } > > /* copied from fs/ioctl.c */ > -static int fiemap_check_ranges(struct super_block *sb, > +static int ext4_fiemap_check_ranges(struct super_block *sb, > u64 start, u64 len, u64 *new_len) > { > u64 maxbytes = (u64) sb->s_maxbytes; > @@ -775,7 +775,7 @@ static int ext4_ioctl_get_es_cache(struct file *filp, unsigned long arg) > if (fiemap.fm_extent_count > FIEMAP_MAX_EXTENTS) > return -EINVAL; > > - error = fiemap_check_ranges(sb, fiemap.fm_start, fiemap.fm_length, > + error = ext4_fiemap_check_ranges(sb, fiemap.fm_start, fiemap.fm_length, > &len); > if (error) > return error; > -- > 2.21.0 >
diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c index bfc1281fc4cb..76a2b5200ba3 100644 --- a/fs/ext4/ioctl.c +++ b/fs/ext4/ioctl.c @@ -734,7 +734,7 @@ static void ext4_fill_fsxattr(struct inode *inode, struct fsxattr *fa) } /* copied from fs/ioctl.c */ -static int fiemap_check_ranges(struct super_block *sb, +static int ext4_fiemap_check_ranges(struct super_block *sb, u64 start, u64 len, u64 *new_len) { u64 maxbytes = (u64) sb->s_maxbytes; @@ -775,7 +775,7 @@ static int ext4_ioctl_get_es_cache(struct file *filp, unsigned long arg) if (fiemap.fm_extent_count > FIEMAP_MAX_EXTENTS) return -EINVAL; - error = fiemap_check_ranges(sb, fiemap.fm_start, fiemap.fm_length, + error = ext4_fiemap_check_ranges(sb, fiemap.fm_start, fiemap.fm_length, &len); if (error) return error;
This renames the fiemap_check_ranges() copy of function within ext4/ioctl.c to become ext4_fiemap_check_ranges(). This is required so that we can finally get rid of this duplicate version. Since overlayfs anyways need to use this in it's ovl_fiemap() function, so later patches make it available for use by others via EXPORT_SYMBOL. Signed-off-by: Ritesh Harjani <riteshh@linux.ibm.com> --- fs/ext4/ioctl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)