From aa7ba057d3b2e0077bcd1605ce67e854c9cb93a4 Mon Sep 17 00:00:00 2001
From: Andrey Mirkin <amirkin@openvz.org>
Date: Wed, 6 Dec 2006 20:31:35 -0800
Subject: [PATCH] --- yaml --- r: 42639 b: refs/heads/master c:
 822191a2fa1584a29c3224ab328507adcaeac1ab h: refs/heads/master i:   42637:
 cd8ac60b76834c9d4ba7d098982bb3bef05ad727   42635:
 3b1c5bbd352e55917e2675d95b508237677968f6   42631:
 cbb08f7c875088b933f2a7f50f82583e3c01b1f3   42623:
 ac99c8d8a1914ed0509a3c8131fe652ef793f955 v: v3

---
 [refs]            | 2 +-
 trunk/fs/compat.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 56f4832e7d20..d559a4a8c7ec 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a1e85378ba50694cf8f27b190c7e16d7c8dad276
+refs/heads/master: 822191a2fa1584a29c3224ab328507adcaeac1ab
diff --git a/trunk/fs/compat.c b/trunk/fs/compat.c
index 06dad665b88f..7aef5412f49c 100644
--- a/trunk/fs/compat.c
+++ b/trunk/fs/compat.c
@@ -871,7 +871,7 @@ asmlinkage long compat_sys_mount(char __user * dev_name, char __user * dir_name,
 
 	retval = -EINVAL;
 
-	if (type_page) {
+	if (type_page && data_page) {
 		if (!strcmp((char *)type_page, SMBFS_NAME)) {
 			do_smb_super_data_conv((void *)data_page);
 		} else if (!strcmp((char *)type_page, NCPFS_NAME)) {