Merge commit 'v2.6.27-rc3' into x86/prototypes

Conflicts:

	include/asm-x86/dma-mapping.h

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 3 insertions, 3 deletions

diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index 1b94e3650f5c..9abcd2b329f7 100644
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -1718,9 +1718,9 @@ 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 ((nfsvers == 4 && options4->version == 1) ||
-            (nfsvers <= 3 && options->version >= 1 &&
-             options->version <= 6))
+        if ((nfsvers == 4 && (!options4 || options4->version == 1)) ||
+            (nfsvers <= 3 && (!options || (options->version >= 1 &&
+                                           options->version <= 6))))
                 return 0;
 
         data = kzalloc(sizeof(*data), GFP_KERNEL);