Prev: bug report: ceph: && vs ||
Next: virtio-balloon: allow hypervisor refuse locking some pages
From: Dan Carpenter on 20 Mar 2010 09:10
"xattr" is never NULL here. We took care of that in the previous
if statement block.

Signed-off-by: Dan Carpenter <error27(a)gmail.com>

diff --git a/fs/ceph/xattr.c b/fs/ceph/xattr.c
index 37d6ce6..65b0e9b 100644
--- a/fs/ceph/xattr.c
+++ b/fs/ceph/xattr.c
@@ -185,12 +185,6 @@ static int __set_xattr(struct ceph_inode_info *ci,
ci->i_xattrs.names_size -= xattr->name_len;
ci->i_xattrs.vals_size -= xattr->val_len;
}
- if (!xattr) {
- pr_err("__set_xattr ENOMEM on %p %llx.%llx xattr %s=%s\n",
- &ci->vfs_inode, ceph_vinop(&ci->vfs_inode), name,
- xattr->val);
- return -ENOMEM;
- }
ci->i_xattrs.names_size += name_len;
ci->i_xattrs.vals_size += val_len;
if (val)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
From: Sage Weil on 21 Mar 2010 00:00
On Sat, 20 Mar 2010, Dan Carpenter wrote:

> "xattr" is never NULL here. We took care of that in the previous
> if statement block.
>
> Signed-off-by: Dan Carpenter <error27(a)gmail.com>
>
> diff --git a/fs/ceph/xattr.c b/fs/ceph/xattr.c
> index 37d6ce6..65b0e9b 100644
> --- a/fs/ceph/xattr.c
> +++ b/fs/ceph/xattr.c
> @@ -185,12 +185,6 @@ static int __set_xattr(struct ceph_inode_info *ci,
> ci->i_xattrs.names_size -= xattr->name_len;
> ci->i_xattrs.vals_size -= xattr->val_len;
> }
> - if (!xattr) {
> - pr_err("__set_xattr ENOMEM on %p %llx.%llx xattr %s=%s\n",
> - &ci->vfs_inode, ceph_vinop(&ci->vfs_inode), name,
> - xattr->val);
> - return -ENOMEM;
> - }
> ci->i_xattrs.names_size += name_len;
> ci->i_xattrs.vals_size += val_len;
> if (val)

Applied, thanks!
sage
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: bug report: ceph: && vs ||
Next: virtio-balloon: allow hypervisor refuse locking some pages