Skip to content

Commit 0e9b103

Browse files
torvaldstorvalds
committed
Merge branch 'akpm' (patches from Andrew)
Merge misc fixes from Andrew Morton: "17 fixes" * emailed patches from Andrew Morton <[email protected]>: nilfs2: convert to SPDX license tags drivers/dax/device.c: convert variable to vm_fault_t type lib/Kconfig.debug: fix three typos in help text checkpatch: add __ro_after_init to known $Attribute mm: fix BUG_ON() in vmf_insert_pfn_pud() from VM_MIXEDMAP removal uapi/linux/keyctl.h: don't use C++ reserved keyword as a struct member name memory_hotplug: fix kernel_panic on offline page processing checkpatch: add optional static const to blank line declarations test ipc/shm: properly return EIDRM in shm_lock() mm/hugetlb: filter out hugetlb pages if HUGEPAGE migration is not supported. mm/util.c: improve kvfree() kerneldoc tools/vm/page-types.c: fix "defined but not used" warning tools/vm/slabinfo.c: fix sign-compare warning kmemleak: always register debugfs file mm: respect arch_dup_mmap() return value mm, oom: fix missing tlb_finish_mmu() in __oom_reap_task_mm(). mm: memcontrol: print proper OOM header when no eligible victim left
2 parents 2861952 + ae98043 commit 0e9b103

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+91
-433
lines changed

‎drivers/base/memory.c

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -416,26 +416,24 @@ static ssize_t show_valid_zones(struct device *dev,
416416
struct zone *default_zone;
417417
int nid;
418418

419-
/*
420-
* The block contains more than one zone can not be offlined.
421-
* This can happen e.g. for ZONE_DMA and ZONE_DMA32
422-
*/
423-
if (!test_pages_in_a_zone(start_pfn, start_pfn + nr_pages, &valid_start_pfn, &valid_end_pfn))
424-
return sprintf(buf, "none\n");
425-
426-
start_pfn = valid_start_pfn;
427-
nr_pages = valid_end_pfn - start_pfn;
428-
429419
/*
430420
* Check the existing zone. Make sure that we do that only on the
431421
* online nodes otherwise the page_zone is not reliable
432422
*/
433423
if (mem->state == MEM_ONLINE) {
424+
/*
425+
* The block contains more than one zone can not be offlined.
426+
* This can happen e.g. for ZONE_DMA and ZONE_DMA32
427+
*/
428+
if (!test_pages_in_a_zone(start_pfn, start_pfn + nr_pages,
429+
&valid_start_pfn, &valid_end_pfn))
430+
return sprintf(buf, "none\n");
431+
start_pfn = valid_start_pfn;
434432
strcat(buf, page_zone(pfn_to_page(start_pfn))->name);
435433
goto out;
436434
}
437435

438-
nid = pfn_to_nid(start_pfn);
436+
nid = mem->nid;
439437
default_zone = zone_for_pfn_range(MMOP_ONLINE_KEEP, nid, start_pfn, nr_pages);
440438
strcat(buf, default_zone->name);
441439

‎drivers/dax/device.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,8 @@ static vm_fault_t dev_dax_huge_fault(struct vm_fault *vmf,
392392
{
393393
struct file *filp = vmf->vma->vm_file;
394394
unsigned long fault_size;
395-
int rc, id;
395+
vm_fault_t rc = VM_FAULT_SIGBUS;
396+
int id;
396397
pfn_t pfn;
397398
struct dev_dax *dev_dax = filp->private_data;
398399

‎fs/nilfs2/alloc.c

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,9 @@
1+
// SPDX-License-Identifier: GPL-2.0+
12
/*
23
* alloc.c - NILFS dat/inode allocator
34
*
45
* Copyright (C) 2006-2008 Nippon Telegraph and Telephone Corporation.
56
*
6-
* This program is free software; you can redistribute it and/or modify
7-
* it under the terms of the GNU General Public License as published by
8-
* the Free Software Foundation; either version 2 of the License, or
9-
* (at your option) any later version.
10-
*
11-
* This program is distributed in the hope that it will be useful,
12-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
13-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14-
* GNU General Public License for more details.
15-
*
167
* Originally written by Koji Sato.
178
* Two allocators were unified by Ryusuke Konishi and Amagai Yoshiji.
189
*/

‎fs/nilfs2/alloc.h

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,9 @@
1+
/* SPDX-License-Identifier: GPL-2.0+ */
12
/*
23
* alloc.h - persistent object (dat entry/disk inode) allocator/deallocator
34
*
45
* Copyright (C) 2006-2008 Nippon Telegraph and Telephone Corporation.
56
*
6-
* This program is free software; you can redistribute it and/or modify
7-
* it under the terms of the GNU General Public License as published by
8-
* the Free Software Foundation; either version 2 of the License, or
9-
* (at your option) any later version.
10-
*
11-
* This program is distributed in the hope that it will be useful,
12-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
13-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14-
* GNU General Public License for more details.
15-
*
167
* Originally written by Koji Sato.
178
* Two allocators were unified by Ryusuke Konishi and Amagai Yoshiji.
189
*/

‎fs/nilfs2/bmap.c

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,9 @@
1+
// SPDX-License-Identifier: GPL-2.0+
12
/*
23
* bmap.c - NILFS block mapping.
34
*
45
* Copyright (C) 2006-2008 Nippon Telegraph and Telephone Corporation.
56
*
6-
* This program is free software; you can redistribute it and/or modify
7-
* it under the terms of the GNU General Public License as published by
8-
* the Free Software Foundation; either version 2 of the License, or
9-
* (at your option) any later version.
10-
*
11-
* This program is distributed in the hope that it will be useful,
12-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
13-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14-
* GNU General Public License for more details.
15-
*
167
* Written by Koji Sato.
178
*/
189

‎fs/nilfs2/bmap.h

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,9 @@
1+
/* SPDX-License-Identifier: GPL-2.0+ */
12
/*
23
* bmap.h - NILFS block mapping.
34
*
45
* Copyright (C) 2006-2008 Nippon Telegraph and Telephone Corporation.
56
*
6-
* This program is free software; you can redistribute it and/or modify
7-
* it under the terms of the GNU General Public License as published by
8-
* the Free Software Foundation; either version 2 of the License, or
9-
* (at your option) any later version.
10-
*
11-
* This program is distributed in the hope that it will be useful,
12-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
13-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14-
* GNU General Public License for more details.
15-
*
167
* Written by Koji Sato.
178
*/
189

‎fs/nilfs2/btnode.c

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,9 @@
1+
// SPDX-License-Identifier: GPL-2.0+
12
/*
23
* btnode.c - NILFS B-tree node cache
34
*
45
* Copyright (C) 2005-2008 Nippon Telegraph and Telephone Corporation.
56
*
6-
* This program is free software; you can redistribute it and/or modify
7-
* it under the terms of the GNU General Public License as published by
8-
* the Free Software Foundation; either version 2 of the License, or
9-
* (at your option) any later version.
10-
*
11-
* This program is distributed in the hope that it will be useful,
12-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
13-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14-
* GNU General Public License for more details.
15-
*
167
* Originally written by Seiji Kihara.
178
* Fully revised by Ryusuke Konishi for stabilization and simplification.
189
*

‎fs/nilfs2/btnode.h

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,9 @@
1+
/* SPDX-License-Identifier: GPL-2.0+ */
12
/*
23
* btnode.h - NILFS B-tree node cache
34
*
45
* Copyright (C) 2005-2008 Nippon Telegraph and Telephone Corporation.
56
*
6-
* This program is free software; you can redistribute it and/or modify
7-
* it under the terms of the GNU General Public License as published by
8-
* the Free Software Foundation; either version 2 of the License, or
9-
* (at your option) any later version.
10-
*
11-
* This program is distributed in the hope that it will be useful,
12-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
13-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14-
* GNU General Public License for more details.
15-
*
167
* Written by Seiji Kihara.
178
* Revised by Ryusuke Konishi.
189
*/

‎fs/nilfs2/btree.c

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,9 @@
1+
// SPDX-License-Identifier: GPL-2.0+
12
/*
23
* btree.c - NILFS B-tree.
34
*
45
* Copyright (C) 2005-2008 Nippon Telegraph and Telephone Corporation.
56
*
6-
* This program is free software; you can redistribute it and/or modify
7-
* it under the terms of the GNU General Public License as published by
8-
* the Free Software Foundation; either version 2 of the License, or
9-
* (at your option) any later version.
10-
*
11-
* This program is distributed in the hope that it will be useful,
12-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
13-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14-
* GNU General Public License for more details.
15-
*
167
* Written by Koji Sato.
178
*/
189

‎fs/nilfs2/btree.h

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,9 @@
1+
/* SPDX-License-Identifier: GPL-2.0+ */
12
/*
23
* btree.h - NILFS B-tree.
34
*
45
* Copyright (C) 2005-2008 Nippon Telegraph and Telephone Corporation.
56
*
6-
* This program is free software; you can redistribute it and/or modify
7-
* it under the terms of the GNU General Public License as published by
8-
* the Free Software Foundation; either version 2 of the License, or
9-
* (at your option) any later version.
10-
*
11-
* This program is distributed in the hope that it will be useful,
12-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
13-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14-
* GNU General Public License for more details.
15-
*
167
* Written by Koji Sato.
178
*/
189

‎fs/nilfs2/cpfile.c

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,9 @@
1+
// SPDX-License-Identifier: GPL-2.0+
12
/*
23
* cpfile.c - NILFS checkpoint file.
34
*
45
* Copyright (C) 2006-2008 Nippon Telegraph and Telephone Corporation.
56
*
6-
* This program is free software; you can redistribute it and/or modify
7-
* it under the terms of the GNU General Public License as published by
8-
* the Free Software Foundation; either version 2 of the License, or
9-
* (at your option) any later version.
10-
*
11-
* This program is distributed in the hope that it will be useful,
12-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
13-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14-
* GNU General Public License for more details.
15-
*
167
* Written by Koji Sato.
178
*/
189

‎fs/nilfs2/cpfile.h

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,9 @@
1+
/* SPDX-License-Identifier: GPL-2.0+ */
12
/*
23
* cpfile.h - NILFS checkpoint file.
34
*
45
* Copyright (C) 2006-2008 Nippon Telegraph and Telephone Corporation.
56
*
6-
* This program is free software; you can redistribute it and/or modify
7-
* it under the terms of the GNU General Public License as published by
8-
* the Free Software Foundation; either version 2 of the License, or
9-
* (at your option) any later version.
10-
*
11-
* This program is distributed in the hope that it will be useful,
12-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
13-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14-
* GNU General Public License for more details.
15-
*
167
* Written by Koji Sato.
178
*/
189

‎fs/nilfs2/dat.c

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,9 @@
1+
// SPDX-License-Identifier: GPL-2.0+
12
/*
23
* dat.c - NILFS disk address translation.
34
*
45
* Copyright (C) 2006-2008 Nippon Telegraph and Telephone Corporation.
56
*
6-
* This program is free software; you can redistribute it and/or modify
7-
* it under the terms of the GNU General Public License as published by
8-
* the Free Software Foundation; either version 2 of the License, or
9-
* (at your option) any later version.
10-
*
11-
* This program is distributed in the hope that it will be useful,
12-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
13-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14-
* GNU General Public License for more details.
15-
*
167
* Written by Koji Sato.
178
*/
189

‎fs/nilfs2/dat.h

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,9 @@
1+
/* SPDX-License-Identifier: GPL-2.0+ */
12
/*
23
* dat.h - NILFS disk address translation.
34
*
45
* Copyright (C) 2006-2008 Nippon Telegraph and Telephone Corporation.
56
*
6-
* This program is free software; you can redistribute it and/or modify
7-
* it under the terms of the GNU General Public License as published by
8-
* the Free Software Foundation; either version 2 of the License, or
9-
* (at your option) any later version.
10-
*
11-
* This program is distributed in the hope that it will be useful,
12-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
13-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14-
* GNU General Public License for more details.
15-
*
167
* Written by Koji Sato.
178
*/
189

‎fs/nilfs2/dir.c

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,9 @@
1+
// SPDX-License-Identifier: GPL-2.0+
12
/*
23
* dir.c - NILFS directory entry operations
34
*
45
* Copyright (C) 2005-2008 Nippon Telegraph and Telephone Corporation.
56
*
6-
* This program is free software; you can redistribute it and/or modify
7-
* it under the terms of the GNU General Public License as published by
8-
* the Free Software Foundation; either version 2 of the License, or
9-
* (at your option) any later version.
10-
*
11-
* This program is distributed in the hope that it will be useful,
12-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
13-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14-
* GNU General Public License for more details.
15-
*
167
* Modified for NILFS by Amagai Yoshiji.
178
*/
189
/*

‎fs/nilfs2/direct.c

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,9 @@
1+
// SPDX-License-Identifier: GPL-2.0+
12
/*
23
* direct.c - NILFS direct block pointer.
34
*
45
* Copyright (C) 2006-2008 Nippon Telegraph and Telephone Corporation.
56
*
6-
* This program is free software; you can redistribute it and/or modify
7-
* it under the terms of the GNU General Public License as published by
8-
* the Free Software Foundation; either version 2 of the License, or
9-
* (at your option) any later version.
10-
*
11-
* This program is distributed in the hope that it will be useful,
12-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
13-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14-
* GNU General Public License for more details.
15-
*
167
* Written by Koji Sato.
178
*/
189

‎fs/nilfs2/direct.h

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,9 @@
1+
/* SPDX-License-Identifier: GPL-2.0+ */
12
/*
23
* direct.h - NILFS direct block pointer.
34
*
45
* Copyright (C) 2006-2008 Nippon Telegraph and Telephone Corporation.
56
*
6-
* This program is free software; you can redistribute it and/or modify
7-
* it under the terms of the GNU General Public License as published by
8-
* the Free Software Foundation; either version 2 of the License, or
9-
* (at your option) any later version.
10-
*
11-
* This program is distributed in the hope that it will be useful,
12-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
13-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14-
* GNU General Public License for more details.
15-
*
167
* Written by Koji Sato.
178
*/
189

‎fs/nilfs2/file.c

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,9 @@
1+
// SPDX-License-Identifier: GPL-2.0+
12
/*
23
* file.c - NILFS regular file handling primitives including fsync().
34
*
45
* Copyright (C) 2005-2008 Nippon Telegraph and Telephone Corporation.
56
*
6-
* This program is free software; you can redistribute it and/or modify
7-
* it under the terms of the GNU General Public License as published by
8-
* the Free Software Foundation; either version 2 of the License, or
9-
* (at your option) any later version.
10-
*
11-
* This program is distributed in the hope that it will be useful,
12-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
13-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14-
* GNU General Public License for more details.
15-
*
167
* Written by Amagai Yoshiji and Ryusuke Konishi.
178
*/
189

‎fs/nilfs2/gcinode.c

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,9 @@
1+
// SPDX-License-Identifier: GPL-2.0+
12
/*
23
* gcinode.c - dummy inodes to buffer blocks for garbage collection
34
*
45
* Copyright (C) 2005-2008 Nippon Telegraph and Telephone Corporation.
56
*
6-
* This program is free software; you can redistribute it and/or modify
7-
* it under the terms of the GNU General Public License as published by
8-
* the Free Software Foundation; either version 2 of the License, or
9-
* (at your option) any later version.
10-
*
11-
* This program is distributed in the hope that it will be useful,
12-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
13-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14-
* GNU General Public License for more details.
15-
*
167
* Written by Seiji Kihara, Amagai Yoshiji, and Ryusuke Konishi.
178
* Revised by Ryusuke Konishi.
189
*

0 commit comments

Comments
 (0)