From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753458AbcEWMwY (ORCPT ); Mon, 23 May 2016 08:52:24 -0400 Received: from mail-am1on0145.outbound.protection.outlook.com ([157.56.112.145]:35438 "EHLO emea01-am1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752899AbcEWMwW (ORCPT ); Mon, 23 May 2016 08:52:22 -0400 Authentication-Results: linux-foundation.org; dkim=none (message not signed) header.d=none;linux-foundation.org; dmarc=none action=none header.from=virtuozzo.com; From: Vladimir Davydov To: Andrew Morton CC: Johannes Weiner , Michal Hocko , , Subject: [PATCH 1/8] mm: remove pointless struct in struct page definition Date: Mon, 23 May 2016 13:20:22 +0300 Message-ID: X-Mailer: git-send-email 2.1.4 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [195.214.232.10] X-ClientProxiedBy: DB5PR06CA0038.eurprd06.prod.outlook.com (2a01:111:e400:52c2::48) To AM3PR08MB0579.eurprd08.prod.outlook.com (2a01:111:e400:c408::13) X-MS-Office365-Filtering-Correlation-Id: 86e59cec-a66e-4999-7983-08d382f3e2a8 X-Microsoft-Exchange-Diagnostics: 1;AM3PR08MB0579;2:OATlXYP07fqzyRobiGAabZHCYvrtGL15N9ShBWCKROtndi+diQZJl5sn1m6EVyN4cDpNsOuTQnWU6VNpDHxQJidki061yEssilMd+mawRvGksPusESYuMq46ha4j4cNZpL8zF9XTz8ZXligmJPlS9H7J7E5Ms3x0c9zjBbKj7t1r3ABxIACtEwCF3J29ogPt;3:iY9eoI0ehk2lmyNtJUKAQ4BqlXXyqq8xFY57kEANtfT08Cvm/6y+8P/UVVPqoT2qHiUE+STHd00fj8cHZOXaHovqegd967UtJ2AiBIP9elXtKWiOlbAM7YzweseTD+fm X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:AM3PR08MB0579; X-Microsoft-Exchange-Diagnostics: 1;AM3PR08MB0579;25:+UgO6dfZAywZCPD9FkIa+OyIXiTGB2dLbM3k73pkfricVd1ZbeObg51QLOyJT8dIvYDlGBO4xTjfexSeduP2GT6LVaLKh0BeOaydfjqHDKq6pyWRRYv6RBKnQkotIs5+/h9figmRe9Efaaaay2KlE8XLFFCZR/yWakG1Tl9hr4UnQr58Wk0TQwCioT0eD7s48uJo42b1CH4OdS/Ef+TQsYabxF7CTe+D9JvBusyKb3jNqpEG8cfNTUz7vLReEmYvBq9S7vhkrbmivI4rfZUhr39DO0Kb9QGHS2q45PAWY3wlKAc+qo0joiBwxR74BKnI1zit4r7OMNAq0Z7WhR1fERnoynLsMmf4pwib7jgtKPRrDAMamvBqP51/CYwgR+XSOSnsLpCci7ldlFQF6Qzhm05XfXUTDAGu2XNuFJecbVszkGFhAkE/2Ya74GEynHDi0rrvD2gwf77PEnGmvLKKfCSKwqhJ47vbYeuVEy8goilMX89zgWeUosnF5zbnpRAZmNjJ+L3XiTpCFJww2HrF0FwFmVGgDL6vmsFNNx74Mw4OAswN2aPtaf/O+dnltFSuxwD74t89E4+6WBhaB7C3t7ltgR38vjwQJ0v6VRC832PDJF7IXMITSnwzRmRg2qiOjfLTafAAP7H0PxN6GVPwT11RMsXpfjhGaq7Uww0Ad/4G5iTe82Vepc6uAztw4cP1PdLntQEXSQkuPvicz+gazh3akjng7/dtyTUoOv9ZwzXopJC7PGdkDQfrr2PavWOx X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040130)(601004)(2401047)(8121501046)(5005006)(3002001)(10201501046)(6041072)(6043046);SRVR:AM3PR08MB0579;BCL:0;PCL:0;RULEID:;SRVR:AM3PR08MB0579; X-Microsoft-Exchange-Diagnostics: 1;AM3PR08MB0579;4:qZXvf6Pl+RW//uH0pMGpiS4OGHDNKPWMFyLLVMegzKtAlN+VMGDCcc+QDVTkFVwzkTBnrJ5vKkW1OKpJkZrZ5/4mVpZRfe9Tc0uJUoiuF+dXYpXA81V1fSTDacIyrJ3PiCXxiLE7jbzR9BZqA8WVX4dxHRTZtrNlvBYCGNl3NUeaMFDk2mQvqzRIX8TCI8LyS29mb+ohvQNdqC2JnhPTxED0o3cjPTa9O8MIdsVM3Ap9KuJ3h6BoANKW7TPdZMBE6hknSLBUVTrfr268Vr8FvTA8bJ4ObVZrhCRFa2ydK4pzIPpbyZX/mZRLV7QbqWM1WTCWX6o9hnFxHUowJ/UjtTWgF8GiuejgyyjHqVqcilagoI/sR3VJmTTsZ2DTQ+nAg3Jd14O00evR2T248GbfAKjIMqu1skCnNcyWPM29IJw= X-Forefront-PRVS: 0951AB0A30 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(4630300001)(6009001)(6116002)(3846002)(19580405001)(8676002)(19580395003)(586003)(80792005)(36756003)(42186005)(76176999)(92566002)(86362001)(50226002)(110136002)(189998001)(4326007)(2906002)(81166006)(5008740100001)(33646002)(66066001)(229853001)(2950100001)(47776003)(50986999)(118296001)(48376002)(5003940100001)(5004730100002)(50466002);DIR:OUT;SFP:1102;SCL:1;SRVR:AM3PR08MB0579;H:virtuozzo.com;FPR:;SPF:None;MLV:sfv;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;AM3PR08MB0579;23:pvYE2pA3sLkE3kOnI7PbiT284yc++tByvEtEdw9RFhJFChK6PeMfrf+l46epQnwOZWBzqafZ6ZKgf/TIZ9Xx/36M19qJEUglBnPpgU3JBZ+KVuqYNZFZxsUuSyFcGi2daar2cLDJlt5KwtZzTnNFxNYgT7gNoTTPocXLgXjqUIm40o7MhaHZKpxmGu8KvhcgJ3+WJLzBwNd+yW4mOSB9jngkdTOr9jB5vwu99WXhjwvqHCDIzM0JNnqp/5UwpzyVsIZb1aZubO55O5bEmbM4O2UE4Hj7I+KEgwlYt1dwZYniohLrvWTF/o/V3T0ibZ23KbdlxbCyOLmS14KvNE2uTU8GBI8YeEKCIUjZ3Nb48m/cb2H0gaLM/cMBkhkHgNpMUiJx/Q7/HpeHdtmGKOoCTWWt/08k2GV8yMFW0OMYaBuwv8D+ECbATj95laD5Skz9UHeSQRJkIbig3EWFpVlHLJt+CIz6V9WMdB0OZ9Zj9wvESpfHwwC5K62SoYIEBSXKRhVIhnQKSFKYYjf4JZDp/RIoGsokb8upyVmK/sMjJUo9CQVpHtNlMtFoGVe6s3Y0+7CnSX/96N5sQZYtHp3t/newl5S7ApZmyx1KmI7k76XbH5rmrBSL6SyV5gCQLvRX6XQx9JhAUXSGw6pTruiz6OkxQDttsxo2e1EjvAnxNJVf/Cpb9a4Sj7/bz+ei9kNOWLD0aMN5hXxKBXHNX+x1a0OmKSxNbMvefDm2mTqvNWRqUzhleBUwQ1MuSLVG2EDbP7aR6FUZ7RIiNXewo+iXacuWQOOKd+OEFhvkV7ieJIHCfGFJ00og7lsM195Gbs2KRRgNsQFYR/odoUCZutETfF6y8xJ3pWeCFhevkNTZvSKSeWO2pg/8cipzxGNLiHlK X-Microsoft-Exchange-Diagnostics: 1;AM3PR08MB0579;5:2ZIjgj6+7LERI3zO4g4QwEp65Utml6B2wPzfzp2JbRY6JzOm7nAg4B0TflZdqxei2cZTC3HYDDDctXGdLrolf690W4+fTtG/m3yJkAjtqWE5zhFJ2w6IZICIHoHxt/TwZ63hwuPggcaX05HoGBcXxA==;24:WaaqvPe1nrqw3b4kZK47+AZwPav5zA/cYVaqhJl0c9B2CZCxY7XqprPFwPpdegk4smqKTYOFnT+ulWzL0mAHlBA5MpP9wWyefm3xZYdsmNU=;7:QYSwA+MK7st9mNF7Ndnqh9kJRhy525mPP3gwoNz+W05Fdqjyo1/ge5n4EaJc8py3aRyAWU9pzAV6VM23pWmMwffo5nizoaqGejAJpMpaPqlpPIXbMME7UnPUPjR5OmqH/WXqvxhNBdAQjY2ZGoUebseFEcMvzuNzG3WXLz7QxX40/SXri1ekLZ4LYHSNoBqF;20:4em5pi4J7SF6Y1lVJ7o+i7d2BTGOOArMPI89Mqu9w9cI0AWvklQC7nF9bmnC0cWoIPhYPpWA1YFz0K2fWQy9CJIMPmIkXqRCGEE4EP8kaNNlTqlwuanIn8jAF9xmPHgcjsX6Z0G2J778wVHAr3Em8y/atGWTh0JZZH2Y4UqE1pU= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 May 2016 10:20:37.3383 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM3PR08MB0579 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org ... to reduce indentation level thus leaving more space for comments. Signed-off-by: Vladimir Davydov --- include/linux/mm_types.h | 68 +++++++++++++++++++++++------------------------- 1 file changed, 32 insertions(+), 36 deletions(-) diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h index d553855503e6..3cc5977a9cab 100644 --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h @@ -60,51 +60,47 @@ struct page { }; /* Second double word */ - struct { - union { - pgoff_t index; /* Our offset within mapping. */ - void *freelist; /* sl[aou]b first free object */ - /* page_deferred_list().prev -- second tail page */ - }; + union { + pgoff_t index; /* Our offset within mapping. */ + void *freelist; /* sl[aou]b first free object */ + /* page_deferred_list().prev -- second tail page */ + }; - union { + union { #if defined(CONFIG_HAVE_CMPXCHG_DOUBLE) && \ defined(CONFIG_HAVE_ALIGNED_STRUCT_PAGE) - /* Used for cmpxchg_double in slub */ - unsigned long counters; + /* Used for cmpxchg_double in slub */ + unsigned long counters; #else - /* - * Keep _refcount separate from slub cmpxchg_double - * data. As the rest of the double word is protected by - * slab_lock but _refcount is not. - */ - unsigned counters; + /* + * Keep _refcount separate from slub cmpxchg_double data. + * As the rest of the double word is protected by slab_lock + * but _refcount is not. + */ + unsigned counters; #endif + struct { - struct { - - union { - /* - * Count of ptes mapped in mms, to show - * when page is mapped & limit reverse - * map searches. - */ - atomic_t _mapcount; - - struct { /* SLUB */ - unsigned inuse:16; - unsigned objects:15; - unsigned frozen:1; - }; - int units; /* SLOB */ - }; + union { /* - * Usage count, *USE WRAPPER FUNCTION* - * when manual accounting. See page_ref.h + * Count of ptes mapped in mms, to show when + * page is mapped & limit reverse map searches. */ - atomic_t _refcount; + atomic_t _mapcount; + + unsigned int active; /* SLAB */ + struct { /* SLUB */ + unsigned inuse:16; + unsigned objects:15; + unsigned frozen:1; + }; + int units; /* SLOB */ }; - unsigned int active; /* SLAB */ + /* + * Usage count, *USE WRAPPER FUNCTION* when manual + * accounting. See page_ref.h + */ + atomic_t _refcount; }; }; -- 2.1.4