* [patch] ceph: cleanup: remove dead code
@ 2010-03-20 13:01 Dan Carpenter
2010-03-21 3:59 ` [ceph-devel] " Sage Weil
0 siblings, 1 reply; 2+ messages in thread
From: Dan Carpenter @ 2010-03-20 13:01 UTC (permalink / raw)
To: Sage Weil; +Cc: ceph-devel, linux-kernel, kernel-janitors
"xattr" is never NULL here. We took care of that in the previous
if statement block.
Signed-off-by: Dan Carpenter <error27@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)
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [ceph-devel] [patch] ceph: cleanup: remove dead code
2010-03-20 13:01 [patch] ceph: cleanup: remove dead code Dan Carpenter
@ 2010-03-21 3:59 ` Sage Weil
0 siblings, 0 replies; 2+ messages in thread
From: Sage Weil @ 2010-03-21 3:59 UTC (permalink / raw)
To: Dan Carpenter; +Cc: ceph-devel, kernel-janitors, linux-kernel
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@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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-03-21 3:58 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-03-20 13:01 [patch] ceph: cleanup: remove dead code Dan Carpenter
2010-03-21 3:59 ` [ceph-devel] " Sage Weil
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox