From patchwork Thu Feb 14 11:29:11 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Whitcroft X-Patchwork-Id: 220417 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 108582C008E for ; Thu, 14 Feb 2013 22:29:26 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1U5x0A-0003Ke-4Q; Thu, 14 Feb 2013 11:29:18 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1U5x06-0003KK-AB for kernel-team@lists.ubuntu.com; Thu, 14 Feb 2013 11:29:14 +0000 Received: from 79-78-216-65.dynamic.dsl.as9105.com ([79.78.216.65] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1U5x06-00069R-4b; Thu, 14 Feb 2013 11:29:14 +0000 From: Andy Whitcroft To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/1] UBUNTU: ubuntu: overlayfs -- fix missmerge of vfs_open changes Date: Thu, 14 Feb 2013 11:29:11 +0000 Message-Id: <1360841351-7950-2-git-send-email-apw@canonical.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1360841351-7950-1-git-send-email-apw@canonical.com> References: <1360841351-7950-1-git-send-email-apw@canonical.com> Cc: Andy Whitcroft X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com BugLink: http://bugs.launchpad.net/bugs/1122094 Signed-off-by: Andy Whitcroft --- fs/open.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/fs/open.c b/fs/open.c index 7be104a..a500c82 100644 --- a/fs/open.c +++ b/fs/open.c @@ -831,8 +831,12 @@ struct file *nameidata_to_filp(struct nameidata *nd) nd->intent.open.file = NULL; } else { struct file *res; + struct inode *inode = nd->path.dentry->d_inode; - res = vfs_open(&nd->path, filp, cred); + if (inode->i_op->open) + return inode->i_op->open(nd->path.dentry, filp, cred); + + res = do_dentry_open(&nd->path, filp, NULL, cred); if (!IS_ERR(res)) { int error;