[PATCH] xfsprogs: skip FSGEOMETRY call in openfile if no geom var present

Eric Sandeen sandeen at redhat.com
Tue Feb 14 12:37:55 CST 2012


sendfile_f() calls openfile() with NULL *geom even if it's on an
xfs filesystem, so we need to skip the ioctl if (!geom).

Fixes regression from d1b88183bb3fc5e338746db53269310348646753

Reported-by: Christoph Hellwig <hch at infradead.org>
Signed-off-by: Eric Sandeen <sandeen at redhat.com>
---

diff --git a/io/open.c b/io/open.c
index 97631e2..ac39ccc 100644
--- a/io/open.c
+++ b/io/open.c
@@ -163,7 +163,7 @@ openfile(
 		}
 	}
 
-	if (!platform_test_xfs_fd(fd))
+	if (!geom || !platform_test_xfs_fd(fd))
 		return fd;
 
 	if (xfsctl(path, fd, XFS_IOC_FSGEOMETRY, geom) < 0) {



More information about the xfs mailing list