Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751948Ab0HYHMB (ORCPT ); Wed, 25 Aug 2010 03:12:01 -0400 Received: from mail-wy0-f174.google.com ([74.125.82.174]:48514 "EHLO mail-wy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751631Ab0HYHL7 (ORCPT ); Wed, 25 Aug 2010 03:11:59 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:mail-followup-to:mime-version :content-type:content-disposition:user-agent; b=Mxuy55BilTKLsAwpzNFCyYgE+f3BlpUtQB/+lA8h51ns+mHtBVKHH7DAT7KV4TrVvk Vdsr+G2CUXUeCUvnIoHEB1XcBUWksLye66Nanff/QhGTjQqkj40rHtQXYVbZaAA0wj5H xBswApxIPHpkFEwRvoDPOE0lYFX+qOzoOBBqY= Date: Wed, 25 Aug 2010 09:11:35 +0200 From: Dan Carpenter To: Sage Weil Cc: Yehuda Sadeh , ceph-devel@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [patch] ceph: ceph_get_inode() returns an ERR_PTR Message-ID: <20100825071135.GO29330@bicker> Mail-Followup-To: Dan Carpenter , Sage Weil , Yehuda Sadeh , ceph-devel@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.18 (2008-05-17) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 815 Lines: 27 ceph_get_inode() returns an ERR_PTR and it doesn't return a NULL. Signed-off-by: Dan Carpenter diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c index 5d893d3..1e623ec 100644 --- a/fs/ceph/inode.c +++ b/fs/ceph/inode.c @@ -1229,11 +1229,11 @@ retry_lookup: in = dn->d_inode; } else { in = ceph_get_inode(parent->d_sb, vino); - if (in == NULL) { + if (IS_ERR(in)) { dout("new_inode badness\n"); d_delete(dn); dput(dn); - err = -ENOMEM; + err = PTR_ERR(in); goto out; } dn = splice_dentry(dn, in, NULL); -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/