From 227195803091b6b0955ba76acfe9bbff148157f0 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Wed, 19 Dec 2018 00:04:40 +0000 Subject: [PATCH] mm-convert-totalram_pages-and-totalhigh_pages-variables-to-atomic-checkpatch-fixes WARNING: 'lenght' may be misspelled - perhaps 'length'? #7: things. It was discussed in lenght here, WARNING: line over 80 characters #252: FILE: drivers/md/dm-crypt.c:2161: + unsigned long pages = (totalram_pages() - totalhigh_pages()) * DM_CRYPT_MEMORY_PERCENT / 100; WARNING: line over 80 characters #263: FILE: drivers/md/dm-integrity.c:2846: + if (journal_pages >= totalram_pages() - totalhigh_pages() || journal_desc_size > ULONG_MAX) { WARNING: line over 80 characters #307: FILE: drivers/parisc/ccio-dma.c:1254: + iova_space_size = (u32) (totalram_pages() / count_parisc_driver(&ccio_driver)); WARNING: please, no spaces at the start of a line #472: FILE: include/linux/highmem.h:47: + atomic_long_inc(&_totalhigh_pages);$ WARNING: please, no spaces at the start of a line #477: FILE: include/linux/highmem.h:52: + atomic_long_dec(&_totalhigh_pages);$ WARNING: please, no spaces at the start of a line #482: FILE: include/linux/highmem.h:57: + atomic_long_add(count, &_totalhigh_pages);$ WARNING: please, no spaces at the start of a line #487: FILE: include/linux/highmem.h:62: + atomic_long_set(&_totalhigh_pages, val);$ WARNING: please, no spaces at the start of a line #511: FILE: include/linux/mm.h:54: + return (unsigned long)atomic_long_read(&_totalram_pages);$ WARNING: please, no spaces at the start of a line #516: FILE: include/linux/mm.h:59: + atomic_long_inc(&_totalram_pages);$ WARNING: please, no spaces at the start of a line #521: FILE: include/linux/mm.h:64: + atomic_long_dec(&_totalram_pages);$ WARNING: please, no spaces at the start of a line #526: FILE: include/linux/mm.h:69: + atomic_long_add(count, &_totalram_pages);$ WARNING: please, no spaces at the start of a line #531: FILE: include/linux/mm.h:74: + atomic_long_set(&_totalram_pages, val);$ WARNING: line over 80 characters #722: FILE: mm/page_alloc.c:7288: + (physpages - totalram_pages() - totalcma_pages) << (PAGE_SHIFT - 10), WARNING: Missing a blank line after declarations #745: FILE: mm/shmem.c:118: + unsigned long nr_pages = totalram_pages(); + return min(nr_pages - totalhigh_pages(), nr_pages / 2); total: 0 errors, 15 warnings, 656 lines checked NOTE: For some of the reported defects, checkpatch may be able to mechanically convert to the typical style using --fix or --fix-inplace. ./patches/mm-convert-totalram_pages-and-totalhigh_pages-variables-to-atomic.patch has style problems, please review. NOTE: If any of the errors are false positives, please report them to the maintainer, see CHECKPATCH in MAINTAINERS. Please run checkpatch prior to sending patches Cc: Arun KS Signed-off-by: Andrew Morton --- include/linux/highmem.h | 8 ++++---- include/linux/mm.h | 10 +++++----- mm/shmem.c | 1 + 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/include/linux/highmem.h b/include/linux/highmem.h index cea3a0145b431f..ea5cdbd8c2c326 100644 --- a/include/linux/highmem.h +++ b/include/linux/highmem.h @@ -44,22 +44,22 @@ static inline unsigned long totalhigh_pages(void) static inline void totalhigh_pages_inc(void) { - atomic_long_inc(&_totalhigh_pages); + atomic_long_inc(&_totalhigh_pages); } static inline void totalhigh_pages_dec(void) { - atomic_long_dec(&_totalhigh_pages); + atomic_long_dec(&_totalhigh_pages); } static inline void totalhigh_pages_add(long count) { - atomic_long_add(count, &_totalhigh_pages); + atomic_long_add(count, &_totalhigh_pages); } static inline void totalhigh_pages_set(long val) { - atomic_long_set(&_totalhigh_pages, val); + atomic_long_set(&_totalhigh_pages, val); } void kmap_flush_unused(void); diff --git a/include/linux/mm.h b/include/linux/mm.h index 10dcd89fb8b4d8..1d2be4c2d34aa9 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -51,27 +51,27 @@ static inline void set_max_mapnr(unsigned long limit) { } extern atomic_long_t _totalram_pages; static inline unsigned long totalram_pages(void) { - return (unsigned long)atomic_long_read(&_totalram_pages); + return (unsigned long)atomic_long_read(&_totalram_pages); } static inline void totalram_pages_inc(void) { - atomic_long_inc(&_totalram_pages); + atomic_long_inc(&_totalram_pages); } static inline void totalram_pages_dec(void) { - atomic_long_dec(&_totalram_pages); + atomic_long_dec(&_totalram_pages); } static inline void totalram_pages_add(long count) { - atomic_long_add(count, &_totalram_pages); + atomic_long_add(count, &_totalram_pages); } static inline void totalram_pages_set(long val) { - atomic_long_set(&_totalram_pages, val); + atomic_long_set(&_totalram_pages, val); } extern void * high_memory; diff --git a/mm/shmem.c b/mm/shmem.c index 1f533b971bf35f..c2381974a18fb4 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -115,6 +115,7 @@ static unsigned long shmem_default_max_blocks(void) static unsigned long shmem_default_max_inodes(void) { unsigned long nr_pages = totalram_pages(); + return min(nr_pages - totalhigh_pages(), nr_pages / 2); } #endif