From patchwork Wed Dec 20 20:09:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Petros Koutoupis X-Patchwork-Id: 851681 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-ext4-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3z25bB6SKcz9t39 for ; Thu, 21 Dec 2017 07:14:30 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755557AbdLTUOa convert rfc822-to-8bit (ORCPT ); Wed, 20 Dec 2017 15:14:30 -0500 Received: from mout.perfora.net ([74.208.4.197]:52734 "EHLO mout.perfora.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754388AbdLTUO3 (ORCPT ); Wed, 20 Dec 2017 15:14:29 -0500 Received: from petros-ultrathin ([99.41.188.243]) by mrelay.perfora.net (mreueus003 [74.208.5.2]) with ESMTPSA (Nemesis) id 0Lr19h-1ew9Tf1PsZ-00eaDz; Wed, 20 Dec 2017 21:09:20 +0100 Message-ID: <1513800558.15997.3.camel@petroskoutoupis.com> Subject: [PATCH] ext4.h: Fixed alignment and minor code cleanup. From: Petros Koutoupis To: tytso@mit.edu, adilger.kernel@dilger.ca Cc: linux-ext4@vger.kernel.org Date: Wed, 20 Dec 2017 14:09:18 -0600 X-Mailer: Evolution 3.18.5.2-0ubuntu3.2 Mime-Version: 1.0 X-Provags-ID: V03:K0:nNZPUDQh6tTNGG74SyB+T5B5xx4X386hZL3lQiRou77xCjqZ1x0 kaggJFRFMl20jmGYszbRS851zAcBu6EKoVEYVjFHppoyE4Dj+kn+U/ddGoBIre/IHsTfZzh pOS7kcnpnVTVaxzgEmBuwR5TRFGYbupNQ90O5ZFJ2oGgBFbaKfsX6rYSTWSIB0L/WWEhrpb FQ5yOdJWRbZ2vuKSbBrzA== X-UI-Out-Filterresults: notjunk:1; V01:K0:YHYh56eS0w0=:MLDCCAKYvGitFmgtWSFtrF KMANRvPgZrShzAAFq4rnnjrU1yy3FtiMo8QU9wovTf20cBlh5AP2Q/lUxdRc/IQ0OI8UUu21s l2c6eI5d/ej6Ol4zws0W3mGOcg+CcoDESPteZ9WoCTMJEilDXaZk6NhZZALhcXMc1xDrjAInP xail3tLBYbKurOpUXbkPGlzTpTyZh0C3EnUusr6xSXCA3S+K8F7ooVop2IwE4uNVLlOnu54Hf 1ItGaaPGZLXSRE3CMYf45hhZdqtNj7KjTDfJXPgsX8PqPFo6AckuTUv7KADaQaenxEK36UKiS QErOLLgKxcaaP5eFnXB7PxCh1TcEcWr8u0bHkiRSJPVQm3iDpnKjbyig9cCIC1wM7oINtuqhg jhxJYqb9Nxy2Urvw6uV5iumQ7St2kiyZOKVd4BOAx/zQpFyC0lYOFWwDNQsnJb0IQthvMHbmm q9V6pDHxl+koF+xouavNu/TVbbwrYO8kU/yoWzJJ7Y4WbxgOOD0PA+dZ+LBVD5ink86hdYv1+ spvW+zgStVi8FiwKcpj+Oo093lanRD5rpW5J0WPfKIc92Jqeyfhq9m368AsBFfwy7HlPlWxgp SZEhSuuHp4AlDkwD4tXeKLmvKScUSAy+2pJw1I34Hr14ycKxwv84Vl+siyIQ6Yg9OtjUIcu5i Os4rQuFBSp5oxgPSkYap09FemxJGaA+iEAFY3oNofZM8dEttd4USDe5m9yNSyqFG8An7GIBsb lycg+19Np6B4TpEVrqB7tzDH5nKlRiDOsHtT7y0uBPdzaE1UfL4IzFMnfWo= Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org Minor code cleanup: Fixed alignment and a reduction of lines in header file. Signed-off-by: Petros Koutoupis diff -uNpr linux-4.15-rc4.orig/fs/ext4/ext4.h linux-4.15-rc4/fs/ext4/ext4.h --- linux-4.15-rc4.orig/fs/ext4/ext4.h 2017-12-18 08:35:04.000000000 -0600 +++ linux-4.15-rc4/fs/ext4/ext4.h 2017-12-18 08:37:02.000000000 -0600 @@ -611,10 +611,10 @@ enum {  /*   * Flags used by ext4_free_blocks   */ -#define EXT4_FREE_BLOCKS_METADATA 0x0001 -#define EXT4_FREE_BLOCKS_FORGET 0x0002 -#define EXT4_FREE_BLOCKS_VALIDATED 0x0004 -#define EXT4_FREE_BLOCKS_NO_QUOT_UPDATE 0x0008 +#define EXT4_FREE_BLOCKS_METADATA 0x0001 +#define EXT4_FREE_BLOCKS_FORGET 0x0002 +#define EXT4_FREE_BLOCKS_VALIDATED 0x0004 +#define EXT4_FREE_BLOCKS_NO_QUOT_UPDATE 0x0008  #define EXT4_FREE_BLOCKS_NOFREE_FIRST_CLUSTER 0x0010  #define EXT4_FREE_BLOCKS_NOFREE_LAST_CLUSTER 0x0020   @@ -1986,10 +1986,10 @@ static inline __le16 ext4_rec_len_to_dis    /* Legal values for the dx_root hash_version field: */   -#define DX_HASH_LEGACY 0 -#define DX_HASH_HALF_MD4 1 -#define DX_HASH_TEA 2 -#define DX_HASH_LEGACY_UNSIGNED 3 +#define DX_HASH_LEGACY 0 +#define DX_HASH_HALF_MD4 1 +#define DX_HASH_TEA 2 +#define DX_HASH_LEGACY_UNSIGNED 3  #define DX_HASH_HALF_MD4_UNSIGNED 4  #define DX_HASH_TEA_UNSIGNED 5   @@ -2000,7 +2000,6 @@ static inline u32 ext4_chksum(struct ext   struct shash_desc shash;   char ctx[4];   } desc; - int err;     BUG_ON(crypto_shash_descsize(sbi->s_chksum_driver)!=sizeof(desc.ctx));   @@ -2008,8 +2007,7 @@ static inline u32 ext4_chksum(struct ext   desc.shash.flags = 0;   *(u32 *)desc.ctx = crc;   - err = crypto_shash_update(&desc.shash, address, length); - BUG_ON(err); + BUG_ON(crypto_shash_update(&desc.shash, address, length));     return *(u32 *)desc.ctx;  }