From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Date: Wed, 10 May 2017 20:09:42 +0200 From: Christoph Hellwig To: Andy Shevchenko , Amir Goldstein , linux-fsdevel@vger.kernel.org Cc: Shaohua Li , Dan Williams , David Howells , Steven Whitehouse , Mimi Zohar , linux-xfs@vger.kernel.org, linux-raid@vger.kernel.org, linux-nvdimm@lists.01.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 14/16] block: remove blk_part_pack_uuid Message-ID: <20170510180942.GA5361@lst.de> References: <20170510180214.16852-1-hch@lst.de> <20170510180214.16852-15-hch@lst.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170510180214.16852-15-hch@lst.de> Sender: linux-kernel-owner@vger.kernel.org List-ID: On Wed, May 10, 2017 at 08:02:12PM +0200, Christoph Hellwig wrote: > This helper was only used by IMA of all things, which would get spurious > errors if CONFIG_BLOCK is disabled. Just opencode the call there. > > Signed-off-by: Christoph Hellwig > [andy: correctly handle error returns from uuid_to_bin] > Signed-off-by: Andy Shevchenko > --- > security/integrity/ima/ima_policy.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/security/integrity/ima/ima_policy.c b/security/integrity/ima/ima_policy.c > index 4d1178610145..49fbc3e8f012 100644 > --- a/security/integrity/ima/ima_policy.c > +++ b/security/integrity/ima/ima_policy.c > @@ -717,8 +717,9 @@ static int ima_parse_rule(char *rule, struct ima_rule_entry *entry) > break; > } > > - uuid_to_bin(args[0].from, (uuid_t *)entry->fsuuid); > - entry->flags |= IMA_FSUUID; > + result = uuid_to_bin(args[0].from, (uuid_t *)&entry->fsuuid); > + if (!result) > + entry->flags |= IMA_FSUUID; This should have been folded into the previous patch..