NFS: make "inode number mismatch" message more useful

[powerpc.git] / fs / xattr.c

diff --git a/fs/xattr.c b/fs/xattr.c
index f6e00c0..bcc2156 100644 (file)
--- a/fs/xattr.c
+++ b/fs/xattr.c
@@ -74,8 +74,7 @@ setxattr(struct dentry *d, char __user *name, void __user *value,
        }
 out:
        up(&d->d_inode->i_sem);
-       if (kvalue)
-               kfree(kvalue);
+       kfree(kvalue);
        return error;
 }
 
@@ -173,8 +172,7 @@ getxattr(struct dentry *d, char __user *name, void __user *value, size_t size)
                error = -E2BIG;
        }
 out:
-       if (kvalue)
-               kfree(kvalue);
+       kfree(kvalue);
        return error;
 }
 
@@ -247,7 +245,7 @@ listxattr(struct dentry *d, char __user *list, size_t size)
                error = d->d_inode->i_op->listxattr(d, klist, size);
        } else {
                error = security_inode_listsecurity(d->d_inode, klist, size);
-               if (size && error >= size)
+               if (size && error > size)
                        error = -ERANGE;
        }
        if (error > 0) {
@@ -259,8 +257,7 @@ listxattr(struct dentry *d, char __user *list, size_t size)
                error = -E2BIG;
        }
 out:
-       if (klist)
-               kfree(klist);
+       kfree(klist);
        return error;
 }