From: Eric Sandeen <sandeen@redhat.com>
To: xfs-oss <xfs@oss.sgi.com>, Christoph Hellwig <hch@infradead.org>
Subject: [PATCH] xfsprogs: skip FSGEOMETRY call in openfile if no geom var present
Date: Tue, 14 Feb 2012 10:37:55 -0800 [thread overview]
Message-ID: <4F3AAA03.2010305@redhat.com> (raw)
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@infradead.org>
Signed-off-by: Eric Sandeen <sandeen@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) {
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
next reply other threads:[~2012-02-14 18:38 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-14 18:37 Eric Sandeen [this message]
2012-02-17 17:21 ` [PATCH] xfsprogs: skip FSGEOMETRY call in openfile if no geom var present Christoph Hellwig
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4F3AAA03.2010305@redhat.com \
--to=sandeen@redhat.com \
--cc=hch@infradead.org \
--cc=xfs@oss.sgi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox