[PATCH] xfs_fsr: Get the last mount on a specific mount point

[PATCH] xfs_fsr: Get the last mount on a specific mount point

[Carlos Maiolino]

Actually xfs_fsr uses the first mount matching the mount point specified. Since
Linux allows more than one mount over the same mount point, the best to do is to
use the last mount found in /proc/mounts, instead of the first one.

Thanks to Eric Sandeen for suggesting the patch

Signed-off-by: Carlos Maiolino <cmaiolino@redhat.com>
---
 fsr/xfs_fsr.c |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/fsr/xfs_fsr.c b/fsr/xfs_fsr.c
index 40c2e6f..4e6d706 100644
--- a/fsr/xfs_fsr.c
+++ b/fsr/xfs_fsr.c
@@ -1646,7 +1646,9 @@ getmntany(FILE *fp, struct mntent *mp, struct mntent *mpref, struct stat64 *s)
 {
 	struct mntent *t;
 	struct stat64 ms;
+	int found = 0;
 
+	memset(mp, 0, sizeof(struct mntent));
 	while ((t = getmntent(fp))) {
 		if (mpref->mnt_fsname) {	/* device */
 			if (stat64(t->mnt_fsname, &ms) < 0)
@@ -1660,10 +1662,16 @@ getmntany(FILE *fp, struct mntent *mp, struct mntent *mpref, struct stat64 *s)
 			if (s->st_ino != ms.st_ino || s->st_dev != ms.st_dev)
 				continue;
 		}
-		*mp = *t;
-		break;
+
+		found = 1;
+		free(mp->mnt_fsname);
+		free(mp->mnt_dir);
+		free(mp->mnt_type);
+		mp->mnt_fsname = strdup(t->mnt_fsname);
+		mp->mnt_dir = strdup(t->mnt_dir);
+		mp->mnt_type = strdup(t->mnt_type);
 	}
-	return (t != NULL);
+	return (found);
 }
 
 
-- 
1.7.6.5

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [PATCH] xfs_fsr: Get the last mount on a specific mount point

[Christoph Hellwig]

Thanks for taking care of this, but this just seems to make the already
horribly ugly code even worse.

What do you think about the version below?

---
From: Christoph Hellwig <hch@lst.de>
Subject: fsr: fix /proc/mounts parsing

Make sure we do not reject an XFS root mount just because /dev/root is also
listed in /proc/mounts.  The root cause for this was the awkward getmntany
function, which is replaced with a broader reach find_mountpoint function
which replace getmntany and the surrounding code from the main routine in
a structured way.  This changes the flow from finding a mounted filesystem
matching the argument and checking that it's XFS to find a mounted XFS
filesystem and thus fixes the bug.

Based on analysis and an earlier patch from
Carlos Maiolino <cmaiolino@redhat.com>.

Signed-off-by: Christoph Hellwig <hch@lst.de>

---
 fsr/xfs_fsr.c |  142 +++++++++++++++++++++++++++++-----------------------------
 1 file changed, 72 insertions(+), 70 deletions(-)

Index: xfsprogs-dev/fsr/xfs_fsr.c
===================================================================
--- xfsprogs-dev.orig/fsr/xfs_fsr.c	2012-02-12 16:30:07.286766766 -0800
+++ xfsprogs-dev/fsr/xfs_fsr.c	2012-02-12 16:42:39.293447376 -0800
@@ -109,7 +109,6 @@ static void tmp_init(char *mnt);
 static char * tmp_next(char *mnt);
 static void tmp_close(char *mnt);
 int xfs_getgeom(int , xfs_fsop_geom_v1_t * );
-static int getmntany(FILE *, struct mntent *, struct mntent *, struct stat64 *);
 
 xfs_fsop_geom_v1_t fsgeom;	/* geometry of active mounted system */
 
@@ -178,18 +177,73 @@ aborter(int unused)
 	exit(1);
 }
 
+/*
+ * Check if the argument is either the device name or mountpoint of an XFS
+ * filesystem.  Note that we do not care about bind mounted regular files
+ * here - the code that handles defragmentation of invidual files takes care
+ * of that.
+ */
+static char *
+find_mountpoint(char *mtab, char *argname, struct stat64 *sb)
+{
+	struct mntent *t;
+	struct stat64 ms;
+	FILE *mtabp;
+	char *mntp = NULL;
+
+	mtabp = setmntent(mtab, "r");
+	if (!mtabp) {
+		fprintf(stderr, _("%s: cannot read %s\n"),
+			progname, mtab);
+		exit(1);
+	}
+
+	while ((t = getmntent(mtabp))) {
+		if (S_ISDIR(sb->st_mode)) {
+			if (stat64(t->mnt_dir, &ms) < 0)
+				continue;
+			if (sb->st_ino != ms.st_ino)
+				continue;
+			if (sb->st_dev != ms.st_dev)
+				continue;
+		} else {
+			if (stat64(t->mnt_fsname, &ms) < 0)
+				continue;
+			if (sb->st_rdev != ms.st_rdev)
+				continue;
+		}
+
+		if (strcmp(t->mnt_type, MNTTYPE_XFS) != 0)
+			continue;
+
+		/*
+		 * If we found an entry based on the device name make sure we
+		 * stat the mountpoint that the mtab gave actually is accessible
+		 * before using it.
+		 */
+		if (S_ISBLK(sb->st_mode)) {
+			struct stat64 sb2;
+
+			if (stat64(t->mnt_dir, &sb2) < 0)
+				continue;
+		}
+
+		mntp = t->mnt_dir;
+		break;
+	}
+
+	endmntent(mtabp);
+	return mntp;
+}
+
 int
 main(int argc, char **argv)
 {
-	struct stat64 sb, sb2;
+	struct stat64 sb;
 	char *argname;
-	char *cp;
 	int c;
-	struct mntent mntpref;
-	register struct mntent *mntp;
-	struct mntent ment;
+	char *mntp;
 	char *mtab = NULL;
-	register FILE *mtabp;
 
 	setlinebuf(stdout);
 	progname = basename(argv[0]);
@@ -281,49 +335,26 @@ main(int argc, char **argv)
 	if (optind < argc) {
 		for (; optind < argc; optind++) {
 			argname = argv[optind];
-			mntp = NULL;
+
 			if (lstat64(argname, &sb) < 0) {
 				fprintf(stderr,
 					_("%s: could not stat: %s: %s\n"),
 					progname, argname, strerror(errno));
 				continue;
 			}
-			if (S_ISLNK(sb.st_mode) && stat64(argname, &sb2) == 0 &&
-			    (S_ISBLK(sb2.st_mode) || S_ISCHR(sb2.st_mode)))
-				sb = sb2;
-			if (S_ISBLK(sb.st_mode) || (S_ISDIR(sb.st_mode))) {
-				if ((mtabp = setmntent(mtab, "r")) == NULL) {
-					fprintf(stderr,
-						_("%s: cannot read %s\n"),
-						progname, mtab);
-					exit(1);
-				}
-				bzero(&mntpref, sizeof(mntpref));
-				if (S_ISDIR(sb.st_mode))
-					mntpref.mnt_dir = argname;
-				else
-					mntpref.mnt_fsname = argname;
 
-				if (getmntany(mtabp, &ment, &mntpref, &sb) &&
-				    strcmp(ment.mnt_type, MNTTYPE_XFS) == 0) {
-					mntp = &ment;
-					if (S_ISBLK(sb.st_mode)) {
-						cp = mntp->mnt_dir;
-						if (cp == NULL ||
-						    stat64(cp, &sb2) < 0) {
-							fprintf(stderr, _(
-						"%s: could not stat: %s: %s\n"),
-							progname, argname,
-							strerror(errno));
-							continue;
-						}
-						sb = sb2;
-						argname = cp;
-					}
-				}
+			if (S_ISLNK(sb.st_mode)) {
+				struct stat64 sb2;
+
+				if (stat64(argname, &sb2) == 0 &&
+				    (S_ISBLK(sb2.st_mode) ||
+				     S_ISCHR(sb2.st_mode)))
+				sb = sb2;
 			}
+
+			mntp = find_mountpoint(mtab, argname, &sb);
 			if (mntp != NULL) {
-				fsrfs(mntp->mnt_dir, 0, 100);
+				fsrfs(mntp, 0, 100);
 			} else if (S_ISCHR(sb.st_mode)) {
 				fprintf(stderr, _(
 					"%s: char special not supported: %s\n"),
@@ -1639,35 +1670,6 @@ fsrprintf(const char *fmt, ...)
 }
 
 /*
- * emulate getmntany
- */
-static int
-getmntany(FILE *fp, struct mntent *mp, struct mntent *mpref, struct stat64 *s)
-{
-	struct mntent *t;
-	struct stat64 ms;
-
-	while ((t = getmntent(fp))) {
-		if (mpref->mnt_fsname) {	/* device */
-			if (stat64(t->mnt_fsname, &ms) < 0)
-				continue;
-			if (s->st_rdev != ms.st_rdev)
-				continue;
-		}
-		if (mpref->mnt_dir) {		/* mount point */
-			if (stat64(t->mnt_dir, &ms) < 0)
-				continue;
-			if (s->st_ino != ms.st_ino || s->st_dev != ms.st_dev)
-				continue;
-		}
-		*mp = *t;
-		break;
-	}
-	return (t != NULL);
-}
-
-
-/*
  * Initialize a directory for tmp file use.  This is used
  * by the full filesystem defragmentation when we're walking
  * the inodes and do not know the path for the individual

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [PATCH] xfs_fsr: Get the last mount on a specific mount point

[Carlos Maiolino]

Hi,

> ---
>  fsr/xfs_fsr.c |  142 +++++++++++++++++++++++++++++-----------------------------
>  1 file changed, 72 insertions(+), 70 deletions(-)
> 
> Index: xfsprogs-dev/fsr/xfs_fsr.c
> ===================================================================
> --- xfsprogs-dev.orig/fsr/xfs_fsr.c	2012-02-12 16:30:07.286766766 -0800
> +++ xfsprogs-dev/fsr/xfs_fsr.c	2012-02-12 16:42:39.293447376 -0800
> @@ -109,7 +109,6 @@ static void tmp_init(char *mnt);
>  static char * tmp_next(char *mnt);
>  static void tmp_close(char *mnt);
>  int xfs_getgeom(int , xfs_fsop_geom_v1_t * );
> -static int getmntany(FILE *, struct mntent *, struct mntent *, struct stat64 *);
>  
>  xfs_fsop_geom_v1_t fsgeom;	/* geometry of active mounted system */
>  
> @@ -178,18 +177,73 @@ aborter(int unused)
>  	exit(1);
>  }
>  
> +/*
> + * Check if the argument is either the device name or mountpoint of an XFS
> + * filesystem.  Note that we do not care about bind mounted regular files
> + * here - the code that handles defragmentation of invidual files takes care
> + * of that.
> + */
> +static char *
> +find_mountpoint(char *mtab, char *argname, struct stat64 *sb)
> +{
> +	struct mntent *t;
> +	struct stat64 ms;
> +	FILE *mtabp;
> +	char *mntp = NULL;
> +
> +	mtabp = setmntent(mtab, "r");
> +	if (!mtabp) {
> +		fprintf(stderr, _("%s: cannot read %s\n"),
> +			progname, mtab);
> +		exit(1);
> +	}
> +
> +	while ((t = getmntent(mtabp))) {
> +		if (S_ISDIR(sb->st_mode)) {
> +			if (stat64(t->mnt_dir, &ms) < 0)
> +				continue;
> +			if (sb->st_ino != ms.st_ino)
> +				continue;
> +			if (sb->st_dev != ms.st_dev)
> +				continue;
> +		} else {
> +			if (stat64(t->mnt_fsname, &ms) < 0)
> +				continue;
> +			if (sb->st_rdev != ms.st_rdev)
> +				continue;
> +		}
> +
> +		if (strcmp(t->mnt_type, MNTTYPE_XFS) != 0)
> +			continue;
> +
> +		/*
> +		 * If we found an entry based on the device name make sure we
> +		 * stat the mountpoint that the mtab gave actually is accessible
> +		 * before using it.
> +		 */
I would change a little this sentence, looks a little confusing at least for me.
How about:

		/* If we found an entry based on the device name, make sure we
		 * stat the mount point given by mtab and ensure it's accessible
		 * before using it.
		 */

> +		if (S_ISBLK(sb->st_mode)) {
> +			struct stat64 sb2;
> +
> +			if (stat64(t->mnt_dir, &sb2) < 0)
> +				continue;
> +		}
> +
> +		mntp = t->mnt_dir;
> +		break;
> +	}
> +
> +	endmntent(mtabp);
> +	return mntp;
> +}
> +
>  int
>  main(int argc, char **argv)
>  {
> -	struct stat64 sb, sb2;
> +	struct stat64 sb;
>  	char *argname;
> -	char *cp;
>  	int c;
> -	struct mntent mntpref;
> -	register struct mntent *mntp;
> -	struct mntent ment;
> +	char *mntp;
>  	char *mtab = NULL;
> -	register FILE *mtabp;
>  
>  	setlinebuf(stdout);
>  	progname = basename(argv[0]);
> @@ -281,49 +335,26 @@ main(int argc, char **argv)
>  	if (optind < argc) {
>  		for (; optind < argc; optind++) {
>  			argname = argv[optind];
> -			mntp = NULL;
> +
>  			if (lstat64(argname, &sb) < 0) {
>  				fprintf(stderr,
>  					_("%s: could not stat: %s: %s\n"),
>  					progname, argname, strerror(errno));
>  				continue;
>  			}
> -			if (S_ISLNK(sb.st_mode) && stat64(argname, &sb2) == 0 &&
> -			    (S_ISBLK(sb2.st_mode) || S_ISCHR(sb2.st_mode)))
> -				sb = sb2;
> -			if (S_ISBLK(sb.st_mode) || (S_ISDIR(sb.st_mode))) {
> -				if ((mtabp = setmntent(mtab, "r")) == NULL) {
> -					fprintf(stderr,
> -						_("%s: cannot read %s\n"),
> -						progname, mtab);
> -					exit(1);
> -				}
> -				bzero(&mntpref, sizeof(mntpref));
> -				if (S_ISDIR(sb.st_mode))
> -					mntpref.mnt_dir = argname;
> -				else
> -					mntpref.mnt_fsname = argname;
>  
> -				if (getmntany(mtabp, &ment, &mntpref, &sb) &&
> -				    strcmp(ment.mnt_type, MNTTYPE_XFS) == 0) {
> -					mntp = &ment;
> -					if (S_ISBLK(sb.st_mode)) {
> -						cp = mntp->mnt_dir;
> -						if (cp == NULL ||
> -						    stat64(cp, &sb2) < 0) {
> -							fprintf(stderr, _(
> -						"%s: could not stat: %s: %s\n"),
> -							progname, argname,
> -							strerror(errno));
> -							continue;
> -						}
> -						sb = sb2;
> -						argname = cp;
> -					}
> -				}
> +			if (S_ISLNK(sb.st_mode)) {
> +				struct stat64 sb2;

Particularly, I don't like variable declarations between statements, but I'm not
too experienced to say what's good or not :)

> +
> +				if (stat64(argname, &sb2) == 0 &&
> +				    (S_ISBLK(sb2.st_mode) ||
> +				     S_ISCHR(sb2.st_mode)))
> +				sb = sb2;
>  			}
> +
> +			mntp = find_mountpoint(mtab, argname, &sb);
>  			if (mntp != NULL) {
> -				fsrfs(mntp->mnt_dir, 0, 100);
> +				fsrfs(mntp, 0, 100);
>  			} else if (S_ISCHR(sb.st_mode)) {
>  				fprintf(stderr, _(
>  					"%s: char special not supported: %s\n"),
> @@ -1639,35 +1670,6 @@ fsrprintf(const char *fmt, ...)
>  }
>  
>  /*
> - * emulate getmntany
> - */
> -static int
> -getmntany(FILE *fp, struct mntent *mp, struct mntent *mpref, struct stat64 *s)
> -{
> -	struct mntent *t;
> -	struct stat64 ms;
> -
> -	while ((t = getmntent(fp))) {
> -		if (mpref->mnt_fsname) {	/* device */
> -			if (stat64(t->mnt_fsname, &ms) < 0)
> -				continue;
> -			if (s->st_rdev != ms.st_rdev)
> -				continue;
> -		}
> -		if (mpref->mnt_dir) {		/* mount point */
> -			if (stat64(t->mnt_dir, &ms) < 0)
> -				continue;
> -			if (s->st_ino != ms.st_ino || s->st_dev != ms.st_dev)
> -				continue;
> -		}
> -		*mp = *t;
> -		break;
> -	}
> -	return (t != NULL);
> -}
> -
> -
> -/*
>   * Initialize a directory for tmp file use.  This is used
>   * by the full filesystem defragmentation when we're walking
>   * the inodes and do not know the path for the individual
> 
> _______________________________________________
> xfs mailing list
> xfs@oss.sgi.com
> http://oss.sgi.com/mailman/listinfo/xfs

Otherwise looks good.
-- 
--Carlos

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [PATCH] xfs_fsr: Get the last mount on a specific mount point

[Christoph Hellwig]

On Wed, Feb 15, 2012 at 10:31:43AM -0200, Carlos Maiolino wrote:
> I would change a little this sentence, looks a little confusing at least for me.
> How about:
> 
> 		/* If we found an entry based on the device name, make sure we
> 		 * stat the mount point given by mtab and ensure it's accessible
> 		 * before using it.
> 		 */

Agreed, I'll redo it.

> > +			if (S_ISLNK(sb.st_mode)) {
> > +				struct stat64 sb2;
> 
> Particularly, I don't like variable declarations between statements, but I'm not
> too experienced to say what's good or not :)

The idea is to keep variable declarations as local as possible.

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [PATCH] xfs_fsr: Get the last mount on a specific mount point

[Eric Sandeen]

On 2/13/12 9:42 AM, Christoph Hellwig wrote:
> Thanks for taking care of this, but this just seems to make the already
> horribly ugly code even worse.
> 
> What do you think about the version below?
> 
> ---
> From: Christoph Hellwig <hch@lst.de>
> Subject: fsr: fix /proc/mounts parsing
> 
> Make sure we do not reject an XFS root mount just because /dev/root is also
> listed in /proc/mounts.  The root cause for this was the awkward getmntany
> function, which is replaced with a broader reach find_mountpoint function
> which replace getmntany and the surrounding code from the main routine in
> a structured way.  This changes the flow from finding a mounted filesystem
> matching the argument and checking that it's XFS to find a mounted XFS
> filesystem and thus fixes the bug.
> 
> Based on analysis and an earlier patch from
> Carlos Maiolino <cmaiolino@redhat.com>.
> 
> Signed-off-by: Christoph Hellwig <hch@lst.de>

Looks ok to me, thanks for doing it properly :)

I like Carlos' suggestion for the comment cleanup, and might suggest that
the /* device */ and /* mount point */ comments remain too; it's obvious
to us now I guess but I think the landmarks are nice for a fresh read.
No biggie.

Reviewed-by: Eric Sandeen <sandeen@redhat.com>

> ---
>  fsr/xfs_fsr.c |  142 +++++++++++++++++++++++++++++-----------------------------
>  1 file changed, 72 insertions(+), 70 deletions(-)
> 
> Index: xfsprogs-dev/fsr/xfs_fsr.c
> ===================================================================
> --- xfsprogs-dev.orig/fsr/xfs_fsr.c	2012-02-12 16:30:07.286766766 -0800
> +++ xfsprogs-dev/fsr/xfs_fsr.c	2012-02-12 16:42:39.293447376 -0800
> @@ -109,7 +109,6 @@ static void tmp_init(char *mnt);
>  static char * tmp_next(char *mnt);
>  static void tmp_close(char *mnt);
>  int xfs_getgeom(int , xfs_fsop_geom_v1_t * );
> -static int getmntany(FILE *, struct mntent *, struct mntent *, struct stat64 *);
>  
>  xfs_fsop_geom_v1_t fsgeom;	/* geometry of active mounted system */
>  
> @@ -178,18 +177,73 @@ aborter(int unused)
>  	exit(1);
>  }
>  
> +/*
> + * Check if the argument is either the device name or mountpoint of an XFS
> + * filesystem.  Note that we do not care about bind mounted regular files
> + * here - the code that handles defragmentation of invidual files takes care
> + * of that.
> + */
> +static char *
> +find_mountpoint(char *mtab, char *argname, struct stat64 *sb)
> +{
> +	struct mntent *t;
> +	struct stat64 ms;
> +	FILE *mtabp;
> +	char *mntp = NULL;
> +
> +	mtabp = setmntent(mtab, "r");
> +	if (!mtabp) {
> +		fprintf(stderr, _("%s: cannot read %s\n"),
> +			progname, mtab);
> +		exit(1);
> +	}
> +
> +	while ((t = getmntent(mtabp))) {
> +		if (S_ISDIR(sb->st_mode)) {
> +			if (stat64(t->mnt_dir, &ms) < 0)
> +				continue;
> +			if (sb->st_ino != ms.st_ino)
> +				continue;
> +			if (sb->st_dev != ms.st_dev)
> +				continue;
> +		} else {
> +			if (stat64(t->mnt_fsname, &ms) < 0)
> +				continue;
> +			if (sb->st_rdev != ms.st_rdev)
> +				continue;
> +		}
> +
> +		if (strcmp(t->mnt_type, MNTTYPE_XFS) != 0)
> +			continue;
> +
> +		/*
> +		 * If we found an entry based on the device name make sure we
> +		 * stat the mountpoint that the mtab gave actually is accessible
> +		 * before using it.
> +		 */
> +		if (S_ISBLK(sb->st_mode)) {
> +			struct stat64 sb2;
> +
> +			if (stat64(t->mnt_dir, &sb2) < 0)
> +				continue;
> +		}
> +
> +		mntp = t->mnt_dir;
> +		break;
> +	}
> +
> +	endmntent(mtabp);
> +	return mntp;
> +}
> +
>  int
>  main(int argc, char **argv)
>  {
> -	struct stat64 sb, sb2;
> +	struct stat64 sb;
>  	char *argname;
> -	char *cp;
>  	int c;
> -	struct mntent mntpref;
> -	register struct mntent *mntp;
> -	struct mntent ment;
> +	char *mntp;
>  	char *mtab = NULL;
> -	register FILE *mtabp;
>  
>  	setlinebuf(stdout);
>  	progname = basename(argv[0]);
> @@ -281,49 +335,26 @@ main(int argc, char **argv)
>  	if (optind < argc) {
>  		for (; optind < argc; optind++) {
>  			argname = argv[optind];
> -			mntp = NULL;
> +
>  			if (lstat64(argname, &sb) < 0) {
>  				fprintf(stderr,
>  					_("%s: could not stat: %s: %s\n"),
>  					progname, argname, strerror(errno));
>  				continue;
>  			}
> -			if (S_ISLNK(sb.st_mode) && stat64(argname, &sb2) == 0 &&
> -			    (S_ISBLK(sb2.st_mode) || S_ISCHR(sb2.st_mode)))
> -				sb = sb2;
> -			if (S_ISBLK(sb.st_mode) || (S_ISDIR(sb.st_mode))) {
> -				if ((mtabp = setmntent(mtab, "r")) == NULL) {
> -					fprintf(stderr,
> -						_("%s: cannot read %s\n"),
> -						progname, mtab);
> -					exit(1);
> -				}
> -				bzero(&mntpref, sizeof(mntpref));
> -				if (S_ISDIR(sb.st_mode))
> -					mntpref.mnt_dir = argname;
> -				else
> -					mntpref.mnt_fsname = argname;
>  
> -				if (getmntany(mtabp, &ment, &mntpref, &sb) &&
> -				    strcmp(ment.mnt_type, MNTTYPE_XFS) == 0) {
> -					mntp = &ment;
> -					if (S_ISBLK(sb.st_mode)) {
> -						cp = mntp->mnt_dir;
> -						if (cp == NULL ||
> -						    stat64(cp, &sb2) < 0) {
> -							fprintf(stderr, _(
> -						"%s: could not stat: %s: %s\n"),
> -							progname, argname,
> -							strerror(errno));
> -							continue;
> -						}
> -						sb = sb2;
> -						argname = cp;
> -					}
> -				}
> +			if (S_ISLNK(sb.st_mode)) {
> +				struct stat64 sb2;
> +
> +				if (stat64(argname, &sb2) == 0 &&
> +				    (S_ISBLK(sb2.st_mode) ||
> +				     S_ISCHR(sb2.st_mode)))
> +				sb = sb2;
>  			}
> +
> +			mntp = find_mountpoint(mtab, argname, &sb);
>  			if (mntp != NULL) {
> -				fsrfs(mntp->mnt_dir, 0, 100);
> +				fsrfs(mntp, 0, 100);
>  			} else if (S_ISCHR(sb.st_mode)) {
>  				fprintf(stderr, _(
>  					"%s: char special not supported: %s\n"),
> @@ -1639,35 +1670,6 @@ fsrprintf(const char *fmt, ...)
>  }
>  
>  /*
> - * emulate getmntany
> - */
> -static int
> -getmntany(FILE *fp, struct mntent *mp, struct mntent *mpref, struct stat64 *s)
> -{
> -	struct mntent *t;
> -	struct stat64 ms;
> -
> -	while ((t = getmntent(fp))) {
> -		if (mpref->mnt_fsname) {	/* device */
> -			if (stat64(t->mnt_fsname, &ms) < 0)
> -				continue;
> -			if (s->st_rdev != ms.st_rdev)
> -				continue;
> -		}
> -		if (mpref->mnt_dir) {		/* mount point */
> -			if (stat64(t->mnt_dir, &ms) < 0)
> -				continue;
> -			if (s->st_ino != ms.st_ino || s->st_dev != ms.st_dev)
> -				continue;
> -		}
> -		*mp = *t;
> -		break;
> -	}
> -	return (t != NULL);
> -}
> -
> -
> -/*
>   * Initialize a directory for tmp file use.  This is used
>   * by the full filesystem defragmentation when we're walking
>   * the inodes and do not know the path for the individual
> 
> _______________________________________________
> xfs mailing list
> xfs@oss.sgi.com
> http://oss.sgi.com/mailman/listinfo/xfs
> 

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [PATCH] xfs_fsr: Get the last mount on a specific mount point

[Carlos Maiolino]

> > What do you think about the version below?
> > 
> > ---
> > From: Christoph Hellwig <hch@lst.de>
> > Subject: fsr: fix /proc/mounts parsing
> > 
> 
> Looks ok to me, thanks for doing it properly :)
> 
> Reviewed-by: Eric Sandeen <sandeen@redhat.com>
> 
> > ---

ping

-- 
--Carlos

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [PATCH] xfs_fsr: Get the last mount on a specific mount point

[Mark Tinguely]

On 04/24/12 15:14, Carlos Maiolino wrote:
>>> What do you think about the version below?
>>>
>>> ---
>>> From: Christoph Hellwig<hch@lst.de>
>>> Subject: fsr: fix /proc/mounts parsing
>>>
>>
>> Looks ok to me, thanks for doing it properly :)
>>
>> Reviewed-by: Eric Sandeen<sandeen@redhat.com>
>>
>>> ---
>
> ping
>

The new test is much better organized.

Reviewed-by: Mark Tinguely <tinguely@sgi.com>

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs