From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1751373AbcAVBpy (ORCPT <rfc822;w@1wt.eu>);
	Thu, 21 Jan 2016 20:45:54 -0500
Received: from mx2.suse.de ([195.135.220.15]:36985 "EHLO mx2.suse.de"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1751091AbcAVBpp (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Thu, 21 Jan 2016 20:45:45 -0500
Date: Fri, 22 Jan 2016 02:45:41 +0100
From: "Luis R. Rodriguez" <mcgrof@suse.com>
To: Josh Boyer <jwboyer@fedoraproject.org>,
        Mimi Zohar <zohar@linux.vnet.ibm.com>
Cc: "Luis R. Rodriguez" <mcgrof@do-not-panic.com>,
        Greg KH <gregkh@linuxfoundation.org>,
        Ming Lei <ming.lei@canonical.com>,
        Johannes Berg <johannes@sipsolutions.net>,
        Andy Lutomirski <luto@amacapital.net>,
        Jonathan Corbet <corbet@lwn.net>,
        David Woodhouse <dwmw2@infradead.org>,
        David Howells <dhowells@redhat.com>,
        Seth Forshee <seth.forshee@canonical.com>,
        Rusty Russell <rusty@rustcorp.com.au>, Michal Marek <mmarek@suse.cz>,
        Matthew Garrett <mjg59@srcf.ucam.org>, kyle@kernel.org,
        Mimi Zohar <zohar@linux.vnet.ibm.com>, dmitry.kasatkin@gmail.com,
        Vivek Goyal <vgoyal@redhat.com>,
        Brian Norris <computersforpeace@gmail.com>,
        Kees Cook <keescook@chromium.org>, shuahkh@osg.samsung.com,
        Linus Torvalds <torvalds@linux-foundation.org>,
        linux-security-module <linux-security-module@vger.kernel.org>,
        keyrings@linux-nfs.org,
        "Linux-Kernel@Vger. Kernel. Org" <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH v3 3/5] firmware: fold successful fw read early
Message-ID: <20160122014541.GV20964@wotan.suse.de>
References: <1450906497-24179-1-git-send-email-mcgrof@do-not-panic.com>
 <1450906497-24179-4-git-send-email-mcgrof@do-not-panic.com>
 <CA+5PVA6O_rhHF2d+4iNjwNCQWz7F5-EwJUBjaM4-XdRYDMxXmw@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <CA+5PVA6O_rhHF2d+4iNjwNCQWz7F5-EwJUBjaM4-XdRYDMxXmw@mail.gmail.com>
User-Agent: Mutt/1.5.21 (2010-09-15)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Mon, Jan 04, 2016 at 03:48:29PM -0500, Josh Boyer wrote:
> On Wed, Dec 23, 2015 at 4:34 PM, Luis R. Rodriguez
> <mcgrof@do-not-panic.com> wrote:
> > From: David Howells <dhowells@redhat.com>
> >
> > We'll be folding in some more checks on fw_read_file_contents(),
> > this will make the success case easier to follow.
> >
> > Signed-off-by: David Howells <dhowells@redhat.com>
> > Signed-off-by: Luis R. Rodriguez <mcgrof@suse.com>
> 
> Reviewed-by: Josh Boyer <jwboyer@fedoraproject.org>

Thanks Josh.

Mimi, this is the other patch that  I was referring to.

  Luis
> 
> > ---
> >  drivers/base/firmware_class.c | 16 +++++++---------
> >  1 file changed, 7 insertions(+), 9 deletions(-)
> >
> > diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
> > index d8148aa89b01..e10a5349aa61 100644
> > --- a/drivers/base/firmware_class.c
> > +++ b/drivers/base/firmware_class.c
> > @@ -361,20 +361,18 @@ static int fw_get_filesystem_firmware(struct device *device,
> >                         continue;
> >                 rc = fw_read_file_contents(file, buf);
> >                 fput(file);
> > -               if (rc)
> > +               if (rc == 0) {
> > +                       dev_dbg(device, "system data: direct-loading firmware %s\n",
> > +                               buf->fw_id);
> > +                       fw_finish_direct_load(device, buf);
> > +                       goto out;
> > +               } else
> >                         dev_warn(device, "system data, attempted to load %s, but failed with error %d\n",
> >                                  path, rc);
> > -               else
> > -                       break;
> >         }
> > +out:
> >         __putname(path);
> >
> > -       if (!rc) {
> > -               dev_dbg(device, "system data: direct-loading firmware %s\n",
> > -                       buf->fw_id);
> > -               fw_finish_direct_load(device, buf);
> > -       }
> > -
> >         return rc;
> >  }
> >
> > --
> > 2.6.2
> >
> 

-- 
Luis Rodriguez, SUSE LINUX GmbH
Maxfeldstrasse 5; D-90409 Nuernberg