Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754283Ab2EUPaf (ORCPT ); Mon, 21 May 2012 11:30:35 -0400 Received: from mail-bk0-f46.google.com ([209.85.214.46]:43253 "EHLO mail-bk0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754084Ab2EUPaa (ORCPT ); Mon, 21 May 2012 11:30:30 -0400 From: Miklos Szeredi To: viro@ZenIV.linux.org.uk Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, hch@infradead.org, torvalds@linux-foundation.org, mszeredi@suse.cz Subject: [PATCH 08/16] vfs: do_last(): only return EISDIR for O_CREAT Date: Mon, 21 May 2012 17:30:12 +0200 Message-Id: <1337614220-6174-9-git-send-email-miklos@szeredi.hu> X-Mailer: git-send-email 1.7.7 In-Reply-To: <1337614220-6174-1-git-send-email-miklos@szeredi.hu> References: <1337614220-6174-1-git-send-email-miklos@szeredi.hu> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 935 Lines: 30 From: Miklos Szeredi This allows this code to be shared between O_CREAT and plain opens. Signed-off-by: Miklos Szeredi --- fs/namei.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/fs/namei.c b/fs/namei.c index d17a4e4..e3136b7 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -2386,7 +2386,7 @@ static struct file *do_last(struct nameidata *nd, struct path *path, if (error) return ERR_PTR(error); error = -EISDIR; - if (S_ISDIR(nd->inode->i_mode)) + if ((open_flag & O_CREAT) && S_ISDIR(nd->inode->i_mode)) goto exit; error = -ENOTDIR; if ((nd->flags & LOOKUP_DIRECTORY) && !nd->inode->i_op->lookup) -- 1.7.7 -- 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/