From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eric Sandeen Subject: [PATCH 4/6] jffs2: fix up error handling for insert_inode_locked Date: Tue, 06 Dec 2011 17:06:06 -0600 Message-ID: <4EDE9FDE.3040109@sandeen.net> References: <4EDE9D54.1030506@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: linux-mtd@lists.infradead.org To: "linux-fsdevel@vger.kernel.org" Return-path: Received: from sandeen.net ([63.231.237.45]:49782 "EHLO mail.sandeen.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755446Ab1LFXGH (ORCPT ); Tue, 6 Dec 2011 18:06:07 -0500 In-Reply-To: <4EDE9D54.1030506@redhat.com> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: after 250df6ed274d767da844a5d9f05720b804240197 (fs: protect inode->i_state with inode->i_lock), insert_inode_locked() no longer returns the inode with I_NEW set on failure. However, the error handler still calls unlock_new_inode() on failure, which does a WARN_ON if I_NEW is not set, so any failure spews a lot of warnings. We can just drop the unlock_new_inode() if insert_inode_locked() fails here. Signed-off-by: Eric Sandeen --- diff --git a/fs/jffs2/fs.c b/fs/jffs2/fs.c index 4b8afe3..2e01238 100644 --- a/fs/jffs2/fs.c +++ b/fs/jffs2/fs.c @@ -466,7 +466,6 @@ struct inode *jffs2_new_inode (struct inode *dir_i, umode_t mode, struct jffs2_r if (insert_inode_locked(inode) < 0) { make_bad_inode(inode); - unlock_new_inode(inode); iput(inode); return ERR_PTR(-EINVAL); }