Merge branch 'for_rmk' of git://github.com/at91linux/linux-2.6-at91 into devel-stable

[karo-tx-linux.git] / fs / nfs / idmap.c

diff --git a/fs/nfs/idmap.c b/fs/nfs/idmap.c
index dec47ed8b6b9aae84cd9d5071d098870a0267d44..18696882f1c63b789dbd611ee560722743f98607 100644 (file)
--- a/fs/nfs/idmap.c
+++ b/fs/nfs/idmap.c
@@ -123,7 +123,7 @@ static ssize_t nfs_idmap_get_desc(const char *name, size_t namelen,
        size_t desclen = typelen + namelen + 2;
 
        *desc = kmalloc(desclen, GFP_KERNEL);
-       if (!desc)
+       if (!*desc)
                return -ENOMEM;
 
        cp = *desc;
@@ -238,7 +238,7 @@ int nfs_map_gid_to_group(struct nfs_client *clp, __u32 gid, char *buf, size_t bu
        return nfs_idmap_lookup_name(gid, "group", buf, buflen);
 }
 
-#else  /* CONFIG_NFS_USE_IDMAPPER not defined */
+#else  /* CONFIG_NFS_USE_NEW_IDMAPPER not defined */
 
 #include <linux/module.h>
 #include <linux/mutex.h>