From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-11.9 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DF752C07E85 for ; Tue, 11 Dec 2018 11:19:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8685120811 for ; Tue, 11 Dec 2018 11:19:59 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8685120811 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=huawei.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726374AbeLKLT6 (ORCPT ); Tue, 11 Dec 2018 06:19:58 -0500 Received: from szxga06-in.huawei.com ([45.249.212.32]:35142 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726170AbeLKLT5 (ORCPT ); Tue, 11 Dec 2018 06:19:57 -0500 Received: from DGGEMS410-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id 7994D53AC7B02; Tue, 11 Dec 2018 19:19:53 +0800 (CST) Received: from [10.151.23.176] (10.151.23.176) by smtp.huawei.com (10.3.19.210) with Microsoft SMTP Server (TLS) id 14.3.408.0; Tue, 11 Dec 2018 19:19:45 +0800 Subject: Re: [PATCH 1/5] drivers: staging: erofs: Fix alignment. To: Aaron Strahlberger CC: Greg Kroah-Hartman , Chao Yu , , , , , Julius Wiedmann , Dominik Huber References: <0ed9f3e7-9081-4a8a-06b0-e5ad14e2c872@huawei.com> <20181211105443.21826-1-aaron.strahlberger@posteo.de> <20181211105443.21826-2-aaron.strahlberger@posteo.de> From: Gao Xiang Message-ID: Date: Tue, 11 Dec 2018 19:19:28 +0800 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.3.0 MIME-Version: 1.0 In-Reply-To: <20181211105443.21826-2-aaron.strahlberger@posteo.de> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.151.23.176] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Aaron, On 2018/12/11 18:54, Aaron Strahlberger wrote: > Fix of 17 `CHECK: Alignment should match open parenthesis` checkpatch.pl > issues. > > Signed-off-by: Aaron Strahlberger > Signed-off-by: Julius Wiedmann > Signed-off-by: Dominik Huber > > LocalWords: Alighnment What's this? > --- > drivers/staging/erofs/data.c | 42 ++++++++++++++++++------------------ > drivers/staging/erofs/dir.c | 8 +++---- > 2 files changed, 25 insertions(+), 25 deletions(-) > > diff --git a/drivers/staging/erofs/data.c b/drivers/staging/erofs/data.c > index 6384f73e5418..d1c0a7be6eb8 100644 > --- a/drivers/staging/erofs/data.c > +++ b/drivers/staging/erofs/data.c > @@ -40,7 +40,7 @@ static inline void read_endio(struct bio *bio) > > /* prio -- true is used for dir */ > struct page *__erofs_get_meta_page(struct super_block *sb, > - erofs_blk_t blkaddr, bool prio, bool nofail) > + erofs_blk_t blkaddr, bool prio, bool nofail) > It seems your styling fix of data.c has been fixed in the latest staging-tree for a month, could you have some time to take a look at the Greg's staging-tree again? https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git/tree/drivers/staging/erofs/data.c?h=staging-next#n42 ... > diff --git a/drivers/staging/erofs/dir.c b/drivers/staging/erofs/dir.c > index d1cb0d78ab84..49a4e7730df0 100644 > --- a/drivers/staging/erofs/dir.c > +++ b/drivers/staging/erofs/dir.c > @@ -24,8 +24,8 @@ static const unsigned char erofs_filetype_table[EROFS_FT_MAX] = { > }; > > static int erofs_fill_dentries(struct dir_context *ctx, > - void *dentry_blk, unsigned int *ofs, > - unsigned int nameoff, unsigned int maxsize) > + void *dentry_blk, unsigned int *ofs, > + unsigned int nameoff, unsigned int maxsize) > { > struct erofs_dirent *de = dentry_blk; > const struct erofs_dirent *end = dentry_blk + nameoff; > @@ -101,9 +101,9 @@ static int erofs_readdir(struct file *f, struct dir_context *ctx) > nameoff = le16_to_cpu(de->nameoff); > > if (unlikely(nameoff < sizeof(struct erofs_dirent) || > - nameoff >= PAGE_SIZE)) { > + nameoff >= PAGE_SIZE)) { > errln("%s, invalid de[0].nameoff %u", > - __func__, nameoff); > + __func__, nameoff); Here is the only valid modification after I use "git am -k -3" to apply this on the latest staging tree... Thanks, Gao Xiang > > err = -EIO; > goto skip_this; > -- 2.19.2