public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Trond Myklebust <trond.myklebust@fys•uio.no>
Cc: linux-next@vger•kernel.org, Jeff Layton <jlayton@redhat•com>
Subject: linux-next: nfs build failure
Date: Tue, 17 Jun 2008 19:26:22 +1000	[thread overview]
Message-ID: <20080617192622.e448a37e.sfr@canb.auug.org.au> (raw)

Hi Trond,

Today's linux-next build (powerpc ppc44x_defconfig) failed like this:

fs/nfs/super.c: In function 'nfs_remount':
fs/nfs/super.c:1440: error: 'nfs4_fs_type' undeclared (first use in this function)

Caused by commit 68a2efd9008ee81e72a4d1dcdf228414f5dfa6ff ("NFS:
implement option checking when remounting NFS filesystems (resend)").

I applied the following patch (which may not be correct).
-- 
Cheers,
Stephen Rothwell                    sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/

>From 9e9b8509043be3ccb6c045df11200ee589e9a42a Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Tue, 17 Jun 2008 19:23:18 +1000
Subject: [PATCH] nfs fix 1

Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>

---
 fs/nfs/super.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index 226ae6a..e951972 100644
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -1437,7 +1437,10 @@ nfs_remount(struct super_block *sb, int *flags, char *raw_data)
 	 * ones were explicitly specified. Fall back to legacy behavior and
 	 * just return success.
 	 */
-	if ((sb->s_type == &nfs4_fs_type && options4->version == 1) ||
+	if (
+#ifdef CONFIG_NFS_V4
+	    (sb->s_type == &nfs4_fs_type && options4->version == 1) ||
+#endif
 	    (sb->s_type == &nfs_fs_type && options->version >= 1 &&
 	     options->version <= 6))
 		return 0;
-- 
1.5.5.4


             reply	other threads:[~2008-06-17  9:26 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-06-17  9:26 Stephen Rothwell [this message]
2008-06-17 20:19 ` linux-next: nfs build failure Trond Myklebust
2008-06-17 20:37   ` Jeff Layton
2008-06-18  0:49   ` Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2008-06-18  2:52 Stephen Rothwell
2008-06-18 20:14 ` Trond Myklebust
2008-06-18 20:37   ` Chuck Lever
2008-06-18 21:15     ` Trond Myklebust
2008-06-18 21:19       ` Randy Dunlap
2008-06-18 22:18         ` Trond Myklebust

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=20080617192622.e448a37e.sfr@canb.auug.org.au \
    --to=sfr@canb$(echo .)auug.org.au \
    --cc=jlayton@redhat$(echo .)com \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=trond.myklebust@fys$(echo .)uio.no \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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