| To: | xfs-oss <xfs@xxxxxxxxxxx>, Christoph Hellwig <hch@xxxxxxxxxxxxx> |
|---|---|
| Subject: | [PATCH] xfsprogs: skip FSGEOMETRY call in openfile if no geom var present |
| From: | Eric Sandeen <sandeen@xxxxxxxxxx> |
| Date: | Tue, 14 Feb 2012 10:37:55 -0800 |
| User-agent: | Mozilla/5.0 (Macintosh; Intel Mac OS X 10.6; rv:10.0) Gecko/20120129 Thunderbird/10.0 |
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@xxxxxxxxxxxxx>
Signed-off-by: Eric Sandeen <sandeen@xxxxxxxxxx>
---
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) {
|
| <Prev in Thread] | Current Thread | [Next in Thread> |
|---|---|---|
| ||
| Previous by Date: | [PATCH] xfstests: more careful size grep in 256, Eric Sandeen |
|---|---|
| Next by Date: | xfs_fsr (defragmenting) 'XFS_IOC_SWAPEXT failed: ino=xxxxxx: Invalid argument' error, Tom Crane |
| Previous by Thread: | [PATCH] xfstests: more careful size grep in 256, Eric Sandeen |
| Next by Thread: | Re: [PATCH] xfsprogs: skip FSGEOMETRY call in openfile if no geom var present, Christoph Hellwig |
| Indexes: | [Date] [Thread] [Top] [All Lists] |