From patchwork Wed Apr 26 21:35:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amir Goldstein X-Patchwork-Id: 9702105 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 02052603F4 for ; Wed, 26 Apr 2017 21:35:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E5A1B285E7 for ; Wed, 26 Apr 2017 21:35:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DA709285EE; Wed, 26 Apr 2017 21:35:45 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CF738285E7 for ; Wed, 26 Apr 2017 21:35:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030904AbdDZVfj (ORCPT ); Wed, 26 Apr 2017 17:35:39 -0400 Received: from mail-wr0-f194.google.com ([209.85.128.194]:35394 "EHLO mail-wr0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1030837AbdDZVfa (ORCPT ); Wed, 26 Apr 2017 17:35:30 -0400 Received: by mail-wr0-f194.google.com with SMTP id g12so1673939wrg.2; Wed, 26 Apr 2017 14:35:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=qH2VN6ZMdBg1nWcd7IOzk0U/nHWwk+UIGXZmO5iZZus=; b=bXc0VTscEVS3YyuNatBY7hl3m04eRtjGI+vkfRZn7V5LWIrsU8TiVjP60WIJeTC3hu LJr1KziF7CLNXFsWsSamuB8CEdGn+mIi5u5J4TpaTnvvRAgQI58gslHZi/u28JLMJngU 69Zvemjc3+6TTNN4hjQzzSYAJcJKYzF74Ij8ea+3WnR5ct6solNzzjIRFQsbTOPDum9g yV6MaGYcek0fmEtDVRK4kjIuQizNq2y25EwYzKMdmzqlxlYAMFHhsf1dWp1xSGiXs+EM vvN9XgrWpO0xgJC8TxJFxVR8teKEFPptLDRb0DPO0pDxdVjD6GHRw7PJhztVMOTR/pXz BoIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=qH2VN6ZMdBg1nWcd7IOzk0U/nHWwk+UIGXZmO5iZZus=; b=hpJXWBLkxImx7xBASCWXg7x3s1nQMLJE6E3t6OPz561Va5K+wgcURY+gHY6E6wiDfi Y+ydaT/QKPnYjUg762d5t8410dbj9H7j5rDEFP04M/YceDRScnXBApBxBouVuxl82Wic 74R4SUvjtShMJm/zWFSkDfdrhEjQc5FbMWsAbEOtX+KaZqKaZMvmgwdOUdX7dBcjgW87 Xuzc0NgSovZsuKSRNnrQTQehjCcaLwQyeg1c/+Z/XdPVAm2Uiwi1JOLEXFxoYKDAl1A8 ZMlV9HfgiKNj45AXw+bBP7p3C/6c4E6iLCE0yGgc7bpaLJvE5nW9lgfgQr/XjjUYWPye EdFg== X-Gm-Message-State: AN3rC/6A0AwR2pZxbJsSa/YFefhCgwO9ETaj88YgBJJXdB2GUoPg+hnG L9ebI2TMTyH5UA== X-Received: by 10.223.138.250 with SMTP id z55mr1215419wrz.50.1493242518493; Wed, 26 Apr 2017 14:35:18 -0700 (PDT) Received: from amir-VirtualBox.lan (bzq-79-179-55-127.red.bezeqint.net. [79.179.55.127]) by smtp.gmail.com with ESMTPSA id 81sm931577wmj.9.2017.04.26.14.35.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 26 Apr 2017 14:35:17 -0700 (PDT) From: Amir Goldstein To: Miklos Szeredi Cc: Vivek Goyal , Al Viro , linux-unionfs@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH v3 06/16] ovl: factor out ovl_lookup_data() Date: Thu, 27 Apr 2017 00:35:08 +0300 Message-Id: <1493242518-15266-7-git-send-email-amir73il@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1493242518-15266-1-git-send-email-amir73il@gmail.com> References: <1493242518-15266-1-git-send-email-amir73il@gmail.com> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Split helper ovl_lookup_data() out of ovl_lookup_single(). The helper takes care of updating the ovl_lookup_data context according to the dentry that was found in layer. Signed-off-by: Amir Goldstein --- fs/overlayfs/namei.c | 36 +++++++++++++++++++++++------------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/fs/overlayfs/namei.c b/fs/overlayfs/namei.c index 17f9372..b965785 100644 --- a/fs/overlayfs/namei.c +++ b/fs/overlayfs/namei.c @@ -96,22 +96,13 @@ static bool ovl_is_opaquedir(struct dentry *dentry) return false; } -static int ovl_lookup_single(struct dentry *base, struct ovl_lookup_data *d, - const char *name, unsigned int namelen, - size_t prelen, const char *post, - struct dentry **ret) +/* Update ovl_lookup_data struct from dentry found in layer */ +static int ovl_lookup_data(struct dentry *this, struct ovl_lookup_data *d, + size_t prelen, const char *post, + struct dentry **ret) { - struct dentry *this; int err; - this = lookup_one_len_unlocked(name, base, namelen); - if (IS_ERR(this)) { - err = PTR_ERR(this); - this = NULL; - if (err == -ENOENT || err == -ENAMETOOLONG) - goto out; - goto out_err; - } if (!this->d_inode) goto put_and_out; @@ -152,6 +143,25 @@ static int ovl_lookup_single(struct dentry *base, struct ovl_lookup_data *d, return err; } +static int ovl_lookup_single(struct dentry *base, struct ovl_lookup_data *d, + const char *name, unsigned int namelen, + size_t prelen, const char *post, + struct dentry **ret) +{ + struct dentry *this = lookup_one_len_unlocked(name, base, namelen); + int err; + + if (IS_ERR(this)) { + err = PTR_ERR(this); + *ret = NULL; + if (err == -ENOENT || err == -ENAMETOOLONG) + return 0; + return err; + } + + return ovl_lookup_data(this, d, prelen, post, ret); +} + static int ovl_lookup_layer(struct dentry *base, struct ovl_lookup_data *d, struct dentry **ret) {