From: Benjamin Coddington <bcodding@redhat.com>
To: xfs@oss.sgi.com, linux-fsdevel@vger.kernel.org,
linux-nfs@vger.kernel.org
Cc: Alexander Viro <viro@zeniv.linux.org.uk>,
Dave Chinner <david@fromorbit.com>,
Christoph Hellwig <hch@lst.de>,
bfields@fieldses.org
Subject: [PATCH 1/2] nfsd: allow SCSI layout support without block layout
Date: Thu, 7 Jul 2016 07:02:31 -0400 [thread overview]
Message-ID: <5ff05b585226b689866f4604adddffc94910f63f.1467889001.git.bcodding@redhat.com> (raw)
We shouldn't have to configure both NFSD_BLOCKLAYOUT and NFSD_SCSILAYOUT if
all we want are SCSI layouts on the server, so define the xfs export
operations for either configuration.
Signed-off-by: Benjamin Coddington <bcodding@redhat.com>
---
fs/xfs/xfs_export.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fs/xfs/xfs_export.c b/fs/xfs/xfs_export.c
index a1b2dd828b9d..b08a5541f292 100644
--- a/fs/xfs/xfs_export.c
+++ b/fs/xfs/xfs_export.c
@@ -246,7 +246,7 @@ const struct export_operations xfs_export_operations = {
.fh_to_parent = xfs_fs_fh_to_parent,
.get_parent = xfs_fs_get_parent,
.commit_metadata = xfs_fs_nfs_commit_metadata,
-#ifdef CONFIG_NFSD_BLOCKLAYOUT
+#if defined(CONFIG_NFSD_BLOCKLAYOUT) || defined(CONFIG_NFSD_SCSILAYOUT)
.get_uuid = xfs_fs_get_uuid,
.map_blocks = xfs_fs_map_blocks,
.commit_blocks = xfs_fs_commit_blocks,
--
2.5.5
next reply other threads:[~2016-07-07 11:02 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-07 11:02 Benjamin Coddington [this message]
2016-07-07 11:02 ` [PATCH 2/2] xfs: abstract block export operations from nfsd layouts Benjamin Coddington
2016-07-07 15:43 ` J. Bruce Fields
2016-07-07 22:38 ` Dave Chinner
2016-07-08 13:24 ` [PATCH 2/2] " Benjamin Coddington
2016-07-08 23:30 ` Dave Chinner
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=5ff05b585226b689866f4604adddffc94910f63f.1467889001.git.bcodding@redhat.com \
--to=bcodding@redhat.com \
--cc=bfields@fieldses.org \
--cc=david@fromorbit.com \
--cc=hch@lst.de \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-nfs@vger.kernel.org \
--cc=viro@zeniv.linux.org.uk \
--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;
as well as URLs for NNTP newsgroup(s).