Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus

1 files changed, 1 insertions, 1 deletions

diff --git a/fs/nfs/idmap.c b/fs/nfs/idmap.c
index 8ae5dba2d4e5..86147b0ab2cf 100644
--- a/fs/nfs/idmap.c
+++ b/fs/nfs/idmap.c
@@ -309,7 +309,7 @@ nfs_idmap_name(struct idmap *idmap, struct idmap_hashtable *h,
         mutex_lock(&idmap->idmap_im_lock);
 
         he = idmap_lookup_id(h, id);
-        if (he != 0) {
+        if (he) {
                 memcpy(name, he->ih_name, he->ih_namelen);
                 ret = he->ih_namelen;
                 goto out;