[1/2] fiemap: Factor out actual fiemap call code
diff mbox

Message ID 1509107832-22286-2-git-send-email-nborisov@suse.com
State New
Headers show

Commit Message

Nikolay Borisov Oct. 27, 2017, 12:37 p.m. UTC
This will be needed to in a subsequent patch to avoid code duplication. No 
functional changes

Signed-off-by: Nikolay Borisov <nborisov@suse.com>
---
 io/fiemap.c | 38 +++++++++++++++++++++++++++-----------
 1 file changed, 27 insertions(+), 11 deletions(-)

Comments

Darrick J. Wong Oct. 27, 2017, 4:33 p.m. UTC | #1
On Fri, Oct 27, 2017 at 03:37:09PM +0300, Nikolay Borisov wrote:
> This will be needed to in a subsequent patch to avoid code duplication. No 
> functional changes
> 
> Signed-off-by: Nikolay Borisov <nborisov@suse.com>
> ---
>  io/fiemap.c | 38 +++++++++++++++++++++++++++-----------
>  1 file changed, 27 insertions(+), 11 deletions(-)
> 
> diff --git a/io/fiemap.c b/io/fiemap.c
> index e6fd66da753d..4a52bff974e8 100644
> --- a/io/fiemap.c
> +++ b/io/fiemap.c
> @@ -211,6 +211,30 @@ calc_print_format(
>  	}
>  }
>  
> +static int
> +__fiemap(struct fiemap * fiemap,

Function parameter should be on a separate line.

> +	 int		 mapsize,
> +	 __u32		 flags,
> +	 __u64		 start,
> +	 __u64		 length) {
> +
> +	int ret;
> +
> +	memset(fiemap, 0, mapsize);
> +        fiemap->fm_flags = flags;

Space/tab indent problems.

> +        fiemap->fm_start = start;
> +        fiemap->fm_length = length;
> +        fiemap->fm_extent_count = EXTENT_BATCH;
> +	ret = ioctl(file->fd, FS_IOC_FIEMAP, (unsigned long)fiemap);

Do we still need the unsigned long cast?

--D

> +	if (ret < 0) {
> +	        fprintf(stderr, "%s: ioctl(FS_IOC_FIEMAP) [\"%s\"]: "
> +	                "%s\n", progname, file->name, strerror(errno));
> +	        return ret;
> +	}
> +
> +	return 0;
> +}
> +
>  int
>  fiemap_f(
>  	int		argc,
> @@ -266,19 +290,11 @@ fiemap_f(
>  
>  	while (!last && (cur_extent != max_extents)) {
>  
> -		memset(fiemap, 0, map_size);
> -		fiemap->fm_flags = fiemap_flags;
> -		fiemap->fm_start = last_logical;
> -		fiemap->fm_length = -1LL;
> -		fiemap->fm_extent_count = EXTENT_BATCH;
> -
> -		ret = ioctl(file->fd, FS_IOC_FIEMAP, (unsigned long)fiemap);
> +		ret = __fiemap(fiemap, map_size, fiemap_flags, last_logical,
> +			       len - covered_length);
>  		if (ret < 0) {
> -			fprintf(stderr, "%s: ioctl(FS_IOC_FIEMAP) [\"%s\"]: "
> -				"%s\n", progname, file->name, strerror(errno));
> -			free(fiemap);
>  			exitcode = 1;
> -			return 0;
> +			goto out;
>  		}
>  
>  		/* No more extents to map, exit */
> -- 
> 2.7.4
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe fstests" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Darrick J. Wong Oct. 27, 2017, 4:37 p.m. UTC | #2
On Fri, Oct 27, 2017 at 09:33:20AM -0700, Darrick J. Wong wrote:
> On Fri, Oct 27, 2017 at 03:37:09PM +0300, Nikolay Borisov wrote:
> > This will be needed to in a subsequent patch to avoid code duplication. No 
> > functional changes
> > 
> > Signed-off-by: Nikolay Borisov <nborisov@suse.com>
> > ---
> >  io/fiemap.c | 38 +++++++++++++++++++++++++++-----------
> >  1 file changed, 27 insertions(+), 11 deletions(-)
> > 
> > diff --git a/io/fiemap.c b/io/fiemap.c
> > index e6fd66da753d..4a52bff974e8 100644
> > --- a/io/fiemap.c
> > +++ b/io/fiemap.c
> > @@ -211,6 +211,30 @@ calc_print_format(
> >  	}
> >  }
> >  
> > +static int
> > +__fiemap(struct fiemap * fiemap,
> 
> Function parameter should be on a separate line.
> 
> > +	 int		 mapsize,
> > +	 __u32		 flags,
> > +	 __u64		 start,
> > +	 __u64		 length) {
> > +
> > +	int ret;
> > +
> > +	memset(fiemap, 0, mapsize);
> > +        fiemap->fm_flags = flags;
> 
> Space/tab indent problems.
> 
> > +        fiemap->fm_start = start;
> > +        fiemap->fm_length = length;
> > +        fiemap->fm_extent_count = EXTENT_BATCH;
> > +	ret = ioctl(file->fd, FS_IOC_FIEMAP, (unsigned long)fiemap);
> 
> Do we still need the unsigned long cast?
> 
> --D
> 
> > +	if (ret < 0) {
> > +	        fprintf(stderr, "%s: ioctl(FS_IOC_FIEMAP) [\"%s\"]: "
> > +	                "%s\n", progname, file->name, strerror(errno));
> > +	        return ret;
> > +	}
> > +
> > +	return 0;
> > +}
> > +
> >  int
> >  fiemap_f(
> >  	int		argc,
> > @@ -266,19 +290,11 @@ fiemap_f(
> >  
> >  	while (!last && (cur_extent != max_extents)) {
> >  
> > -		memset(fiemap, 0, map_size);
> > -		fiemap->fm_flags = fiemap_flags;
> > -		fiemap->fm_start = last_logical;
> > -		fiemap->fm_length = -1LL;
> > -		fiemap->fm_extent_count = EXTENT_BATCH;
> > -
> > -		ret = ioctl(file->fd, FS_IOC_FIEMAP, (unsigned long)fiemap);
> > +		ret = __fiemap(fiemap, map_size, fiemap_flags, last_logical,
> > +			       len - covered_length);

Also, where did covered_length come from?  Isn't that in patch 3?

--D

> >  		if (ret < 0) {
> > -			fprintf(stderr, "%s: ioctl(FS_IOC_FIEMAP) [\"%s\"]: "
> > -				"%s\n", progname, file->name, strerror(errno));
> > -			free(fiemap);
> >  			exitcode = 1;
> > -			return 0;
> > +			goto out;
> >  		}
> >  
> >  		/* No more extents to map, exit */
> > -- 
> > 2.7.4
> > 
> > --
> > To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
> > the body of a message to majordomo@vger.kernel.org
> > More majordomo info at  http://vger.kernel.org/majordomo-info.html
> --
> To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe fstests" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch
diff mbox

diff --git a/io/fiemap.c b/io/fiemap.c
index e6fd66da753d..4a52bff974e8 100644
--- a/io/fiemap.c
+++ b/io/fiemap.c
@@ -211,6 +211,30 @@  calc_print_format(
 	}
 }
 
+static int
+__fiemap(struct fiemap * fiemap,
+	 int		 mapsize,
+	 __u32		 flags,
+	 __u64		 start,
+	 __u64		 length) {
+
+	int ret;
+
+	memset(fiemap, 0, mapsize);
+        fiemap->fm_flags = flags;
+        fiemap->fm_start = start;
+        fiemap->fm_length = length;
+        fiemap->fm_extent_count = EXTENT_BATCH;
+	ret = ioctl(file->fd, FS_IOC_FIEMAP, (unsigned long)fiemap);
+	if (ret < 0) {
+	        fprintf(stderr, "%s: ioctl(FS_IOC_FIEMAP) [\"%s\"]: "
+	                "%s\n", progname, file->name, strerror(errno));
+	        return ret;
+	}
+
+	return 0;
+}
+
 int
 fiemap_f(
 	int		argc,
@@ -266,19 +290,11 @@  fiemap_f(
 
 	while (!last && (cur_extent != max_extents)) {
 
-		memset(fiemap, 0, map_size);
-		fiemap->fm_flags = fiemap_flags;
-		fiemap->fm_start = last_logical;
-		fiemap->fm_length = -1LL;
-		fiemap->fm_extent_count = EXTENT_BATCH;
-
-		ret = ioctl(file->fd, FS_IOC_FIEMAP, (unsigned long)fiemap);
+		ret = __fiemap(fiemap, map_size, fiemap_flags, last_logical,
+			       len - covered_length);
 		if (ret < 0) {
-			fprintf(stderr, "%s: ioctl(FS_IOC_FIEMAP) [\"%s\"]: "
-				"%s\n", progname, file->name, strerror(errno));
-			free(fiemap);
 			exitcode = 1;
-			return 0;
+			goto out;
 		}
 
 		/* No more extents to map, exit */