From patchwork Sat Apr 16 00:55:21 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Al Viro X-Patchwork-Id: 8860671 Return-Path: X-Original-To: patchwork-linux-fsdevel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 5908FBF29F for ; Sat, 16 Apr 2016 00:58:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 983BA2026F for ; Sat, 16 Apr 2016 00:58:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9F8302026C for ; Sat, 16 Apr 2016 00:58:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752496AbcDPA5r (ORCPT ); Fri, 15 Apr 2016 20:57:47 -0400 Received: from zeniv.linux.org.uk ([195.92.253.2]:39583 "EHLO ZenIV.linux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752325AbcDPAz3 (ORCPT ); Fri, 15 Apr 2016 20:55:29 -0400 Received: from viro by ZenIV.linux.org.uk with local (Exim 4.76 #1 (Red Hat Linux)) id 1arEWG-0008IK-Ew; Sat, 16 Apr 2016 00:55:28 +0000 From: Al Viro To: Linus Torvalds Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH 09/15] lookup_slow(): bugger off on IS_DEADDIR() from the very beginning Date: Sat, 16 Apr 2016 01:55:21 +0100 Message-Id: <1460768127-31822-9-git-send-email-viro@ZenIV.linux.org.uk> X-Mailer: git-send-email 2.7.3 In-Reply-To: <20160416005232.GV25498@ZenIV.linux.org.uk> References: <20160416005232.GV25498@ZenIV.linux.org.uk> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Spam-Status: No, score=-7.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Al Viro Signed-off-by: Al Viro --- fs/namei.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/fs/namei.c b/fs/namei.c index c0d551f..6fb33a7 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -1603,8 +1603,15 @@ static struct dentry *lookup_slow(const struct qstr *name, struct dentry *dir, unsigned int flags) { - struct dentry *dentry; - inode_lock(dir->d_inode); + struct dentry *dentry, *old; + struct inode *inode = dir->d_inode; + + inode_lock(inode); + /* Don't go there if it's already dead */ + if (unlikely(IS_DEADDIR(inode))) { + inode_unlock(inode); + return ERR_PTR(-ENOENT); + } dentry = d_lookup(dir, name); if (unlikely(dentry)) { if ((dentry->d_flags & DCACHE_OP_REVALIDATE) && @@ -1618,17 +1625,21 @@ static struct dentry *lookup_slow(const struct qstr *name, } } if (dentry) { - inode_unlock(dir->d_inode); + inode_unlock(inode); return dentry; } } dentry = d_alloc(dir, name); if (unlikely(!dentry)) { - inode_unlock(dir->d_inode); + inode_unlock(inode); return ERR_PTR(-ENOMEM); } - dentry = lookup_real(dir->d_inode, dentry, flags); - inode_unlock(dir->d_inode); + old = inode->i_op->lookup(inode, dentry, flags); + if (unlikely(old)) { + dput(dentry); + dentry = old; + } + inode_unlock(inode); return dentry; }