License cleanup: add SPDX GPL-2.0 license identifier to files with no license
Many source files in the tree are missing licensing information, which
makes it harder for compliance tools to determine the correct license.
By default all files without license information are under the default
license of the kernel, which is GPL version 2.
Update the files which contain no license information with the 'GPL-2.0'
SPDX license identifier. The SPDX identifier is a legally binding
shorthand, which can be used instead of the full boiler plate text.
This patch is based on work done by Thomas Gleixner and Kate Stewart and
Philippe Ombredanne.
How this work was done:
Patches were generated and checked against linux-4.14-rc6 for a subset of
the use cases:
- file had no licensing information it it.
- file was a */uapi/* one with no licensing information in it,
- file was a */uapi/* one with existing licensing information,
Further patches will be generated in subsequent months to fix up cases
where non-standard license headers were used, and references to license
had to be inferred by heuristics based on keywords.
The analysis to determine which SPDX License Identifier to be applied to
a file was done in a spreadsheet of side by side results from of the
output of two independent scanners (ScanCode & Windriver) producing SPDX
tag:value files created by Philippe Ombredanne. Philippe prepared the
base worksheet, and did an initial spot review of a few 1000 files.
The 4.13 kernel was the starting point of the analysis with 60,537 files
assessed. Kate Stewart did a file by file comparison of the scanner
results in the spreadsheet to determine which SPDX license identifier(s)
to be applied to the file. She confirmed any determination that was not
immediately clear with lawyers working with the Linux Foundation.
Criteria used to select files for SPDX license identifier tagging was:
- Files considered eligible had to be source code files.
- Make and config files were included as candidates if they contained >5
lines of source
- File already had some variant of a license header in it (even if <5
lines).
All documentation files were explicitly excluded.
The following heuristics were used to determine which SPDX license
identifiers to apply.
- when both scanners couldn't find any license traces, file was
considered to have no license information in it, and the top level
COPYING file license applied.
For non */uapi/* files that summary was:
SPDX license identifier # files
---------------------------------------------------|-------
GPL-2.0 11139
and resulted in the first patch in this series.
If that file was a */uapi/* path one, it was "GPL-2.0 WITH
Linux-syscall-note" otherwise it was "GPL-2.0". Results of that was:
SPDX license identifier # files
---------------------------------------------------|-------
GPL-2.0 WITH Linux-syscall-note 930
and resulted in the second patch in this series.
- if a file had some form of licensing information in it, and was one
of the */uapi/* ones, it was denoted with the Linux-syscall-note if
any GPL family license was found in the file or had no licensing in
it (per prior point). Results summary:
SPDX license identifier # files
---------------------------------------------------|------
GPL-2.0 WITH Linux-syscall-note 270
GPL-2.0+ WITH Linux-syscall-note 169
((GPL-2.0 WITH Linux-syscall-note) OR BSD-2-Clause) 21
((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) 17
LGPL-2.1+ WITH Linux-syscall-note 15
GPL-1.0+ WITH Linux-syscall-note 14
((GPL-2.0+ WITH Linux-syscall-note) OR BSD-3-Clause) 5
LGPL-2.0+ WITH Linux-syscall-note 4
LGPL-2.1 WITH Linux-syscall-note 3
((GPL-2.0 WITH Linux-syscall-note) OR MIT) 3
((GPL-2.0 WITH Linux-syscall-note) AND MIT) 1
and that resulted in the third patch in this series.
- when the two scanners agreed on the detected license(s), that became
the concluded license(s).
- when there was disagreement between the two scanners (one detected a
license but the other didn't, or they both detected different
licenses) a manual inspection of the file occurred.
- In most cases a manual inspection of the information in the file
resulted in a clear resolution of the license that should apply (and
which scanner probably needed to revisit its heuristics).
- When it was not immediately clear, the license identifier was
confirmed with lawyers working with the Linux Foundation.
- If there was any question as to the appropriate license identifier,
the file was flagged for further research and to be revisited later
in time.
In total, over 70 hours of logged manual review was done on the
spreadsheet to determine the SPDX license identifiers to apply to the
source files by Kate, Philippe, Thomas and, in some cases, confirmation
by lawyers working with the Linux Foundation.
Kate also obtained a third independent scan of the 4.13 code base from
FOSSology, and compared selected files where the other two scanners
disagreed against that SPDX file, to see if there was new insights. The
Windriver scanner is based on an older version of FOSSology in part, so
they are related.
Thomas did random spot checks in about 500 files from the spreadsheets
for the uapi headers and agreed with SPDX license identifier in the
files he inspected. For the non-uapi files Thomas did random spot checks
in about 15000 files.
In initial set of patches against 4.14-rc6, 3 files were found to have
copy/paste license identifier errors, and have been fixed to reflect the
correct identifier.
Additionally Philippe spent 10 hours this week doing a detailed manual
inspection and review of the 12,461 patched files from the initial patch
version early this week with:
- a full scancode scan run, collecting the matched texts, detected
license ids and scores
- reviewing anything where there was a license detected (about 500+
files) to ensure that the applied SPDX license was correct
- reviewing anything where there was no detection but the patch license
was not GPL-2.0 WITH Linux-syscall-note to ensure that the applied
SPDX license was correct
This produced a worksheet with 20 files needing minor correction. This
worksheet was then exported into 3 different .csv files for the
different types of files to be modified.
These .csv files were then reviewed by Greg. Thomas wrote a script to
parse the csv files and add the proper SPDX tag to the file, in the
format that the file expected. This script was further refined by Greg
based on the output to detect more types of files automatically and to
distinguish between header and source .c files (which need different
comment types.) Finally Greg ran the script using the .csv files to
generate the patches.
Reviewed-by: Kate Stewart <kstewart@linuxfoundation.org>
Reviewed-by: Philippe Ombredanne <pombredanne@nexb.com>
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-11-01 17:07:57 +03:00
// SPDX-License-Identifier: GPL-2.0
2005-04-17 02:20:36 +04:00
/*
* linux / fs / hfs / bnode . c
*
* Copyright ( C ) 2001
* Brad Boyer ( flar @ allandria . com )
* ( C ) 2003 Ardis Technologies < roman @ ardistech . com >
*
* Handle basic btree node operations
*/
# include <linux/pagemap.h>
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
percpu.h is included by sched.h and module.h and thus ends up being
included when building most .c files. percpu.h includes slab.h which
in turn includes gfp.h making everything defined by the two files
universally available and complicating inclusion dependencies.
percpu.h -> slab.h dependency is about to be removed. Prepare for
this change by updating users of gfp and slab facilities include those
headers directly instead of assuming availability. As this conversion
needs to touch large number of source files, the following script is
used as the basis of conversion.
http://userweb.kernel.org/~tj/misc/slabh-sweep.py
The script does the followings.
* Scan files for gfp and slab usages and update includes such that
only the necessary includes are there. ie. if only gfp is used,
gfp.h, if slab is used, slab.h.
* When the script inserts a new include, it looks at the include
blocks and try to put the new include such that its order conforms
to its surrounding. It's put in the include block which contains
core kernel includes, in the same order that the rest are ordered -
alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
doesn't seem to be any matching order.
* If the script can't find a place to put a new include (mostly
because the file doesn't have fitting include block), it prints out
an error message indicating which .h file needs to be added to the
file.
The conversion was done in the following steps.
1. The initial automatic conversion of all .c files updated slightly
over 4000 files, deleting around 700 includes and adding ~480 gfp.h
and ~3000 slab.h inclusions. The script emitted errors for ~400
files.
2. Each error was manually checked. Some didn't need the inclusion,
some needed manual addition while adding it to implementation .h or
embedding .c file was more appropriate for others. This step added
inclusions to around 150 files.
3. The script was run again and the output was compared to the edits
from #2 to make sure no file was left behind.
4. Several build tests were done and a couple of problems were fixed.
e.g. lib/decompress_*.c used malloc/free() wrappers around slab
APIs requiring slab.h to be added manually.
5. The script was run on all .h files but without automatically
editing them as sprinkling gfp.h and slab.h inclusions around .h
files could easily lead to inclusion dependency hell. Most gfp.h
inclusion directives were ignored as stuff from gfp.h was usually
wildly available and often used in preprocessor macros. Each
slab.h inclusion directive was examined and added manually as
necessary.
6. percpu.h was updated not to include slab.h.
7. Build test were done on the following configurations and failures
were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my
distributed build env didn't work with gcov compiles) and a few
more options had to be turned off depending on archs to make things
build (like ipr on powerpc/64 which failed due to missing writeq).
* x86 and x86_64 UP and SMP allmodconfig and a custom test config.
* powerpc and powerpc64 SMP allmodconfig
* sparc and sparc64 SMP allmodconfig
* ia64 SMP allmodconfig
* s390 SMP allmodconfig
* alpha SMP allmodconfig
* um on x86_64 SMP allmodconfig
8. percpu.h modifications were reverted so that it could be applied as
a separate patch and serve as bisection point.
Given the fact that I had only a couple of failures from tests on step
6, I'm fairly confident about the coverage of this conversion patch.
If there is a breakage, it's likely to be something in one of the arch
headers which should be easily discoverable easily on most builds of
the specific arch.
Signed-off-by: Tejun Heo <tj@kernel.org>
Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
2010-03-24 11:04:11 +03:00
# include <linux/slab.h>
2005-04-17 02:20:36 +04:00
# include <linux/swap.h>
# include "btree.h"
void hfs_bnode_read ( struct hfs_bnode * node , void * buf ,
int off , int len )
{
struct page * page ;
off + = node - > page_offset ;
page = node - > page [ 0 ] ;
memcpy ( buf , kmap ( page ) + off , len ) ;
kunmap ( page ) ;
}
u16 hfs_bnode_read_u16 ( struct hfs_bnode * node , int off )
{
__be16 data ;
// optimize later...
hfs_bnode_read ( node , & data , off , 2 ) ;
return be16_to_cpu ( data ) ;
}
u8 hfs_bnode_read_u8 ( struct hfs_bnode * node , int off )
{
u8 data ;
// optimize later...
hfs_bnode_read ( node , & data , off , 1 ) ;
return data ;
}
void hfs_bnode_read_key ( struct hfs_bnode * node , void * key , int off )
{
struct hfs_btree * tree ;
int key_len ;
tree = node - > tree ;
if ( node - > type = = HFS_NODE_LEAF | |
tree - > attributes & HFS_TREE_VARIDXKEYS )
key_len = hfs_bnode_read_u8 ( node , off ) + 1 ;
else
key_len = tree - > max_key_len + 1 ;
hfs_bnode_read ( node , key , off , key_len ) ;
}
void hfs_bnode_write ( struct hfs_bnode * node , void * buf , int off , int len )
{
struct page * page ;
off + = node - > page_offset ;
page = node - > page [ 0 ] ;
memcpy ( kmap ( page ) + off , buf , len ) ;
kunmap ( page ) ;
set_page_dirty ( page ) ;
}
void hfs_bnode_write_u16 ( struct hfs_bnode * node , int off , u16 data )
{
__be16 v = cpu_to_be16 ( data ) ;
// optimize later...
hfs_bnode_write ( node , & v , off , 2 ) ;
}
void hfs_bnode_write_u8 ( struct hfs_bnode * node , int off , u8 data )
{
// optimize later...
hfs_bnode_write ( node , & data , off , 1 ) ;
}
void hfs_bnode_clear ( struct hfs_bnode * node , int off , int len )
{
struct page * page ;
off + = node - > page_offset ;
page = node - > page [ 0 ] ;
memset ( kmap ( page ) + off , 0 , len ) ;
kunmap ( page ) ;
set_page_dirty ( page ) ;
}
void hfs_bnode_copy ( struct hfs_bnode * dst_node , int dst ,
struct hfs_bnode * src_node , int src , int len )
{
struct page * src_page , * dst_page ;
2013-05-01 02:27:54 +04:00
hfs_dbg ( BNODE_MOD , " copybytes: %u,%u,%u \n " , dst , src , len ) ;
2005-04-17 02:20:36 +04:00
if ( ! len )
return ;
src + = src_node - > page_offset ;
dst + = dst_node - > page_offset ;
src_page = src_node - > page [ 0 ] ;
dst_page = dst_node - > page [ 0 ] ;
memcpy ( kmap ( dst_page ) + dst , kmap ( src_page ) + src , len ) ;
kunmap ( src_page ) ;
kunmap ( dst_page ) ;
set_page_dirty ( dst_page ) ;
}
void hfs_bnode_move ( struct hfs_bnode * node , int dst , int src , int len )
{
struct page * page ;
void * ptr ;
2013-05-01 02:27:54 +04:00
hfs_dbg ( BNODE_MOD , " movebytes: %u,%u,%u \n " , dst , src , len ) ;
2005-04-17 02:20:36 +04:00
if ( ! len )
return ;
src + = node - > page_offset ;
dst + = node - > page_offset ;
page = node - > page [ 0 ] ;
ptr = kmap ( page ) ;
memmove ( ptr + dst , ptr + src , len ) ;
kunmap ( page ) ;
set_page_dirty ( page ) ;
}
void hfs_bnode_dump ( struct hfs_bnode * node )
{
struct hfs_bnode_desc desc ;
__be32 cnid ;
int i , off , key_off ;
2013-05-01 02:27:54 +04:00
hfs_dbg ( BNODE_MOD , " bnode: %d \n " , node - > this ) ;
2005-04-17 02:20:36 +04:00
hfs_bnode_read ( node , & desc , 0 , sizeof ( desc ) ) ;
2013-05-01 02:27:54 +04:00
hfs_dbg ( BNODE_MOD , " %d, %d, %d, %d, %d \n " ,
2005-04-17 02:20:36 +04:00
be32_to_cpu ( desc . next ) , be32_to_cpu ( desc . prev ) ,
desc . type , desc . height , be16_to_cpu ( desc . num_recs ) ) ;
off = node - > tree - > node_size - 2 ;
for ( i = be16_to_cpu ( desc . num_recs ) ; i > = 0 ; off - = 2 , i - - ) {
key_off = hfs_bnode_read_u16 ( node , off ) ;
2013-05-01 02:27:54 +04:00
hfs_dbg_cont ( BNODE_MOD , " %d " , key_off ) ;
2005-04-17 02:20:36 +04:00
if ( i & & node - > type = = HFS_NODE_INDEX ) {
int tmp ;
if ( node - > tree - > attributes & HFS_TREE_VARIDXKEYS )
tmp = ( hfs_bnode_read_u8 ( node , key_off ) | 1 ) + 1 ;
else
tmp = node - > tree - > max_key_len + 1 ;
2013-05-01 02:27:54 +04:00
hfs_dbg_cont ( BNODE_MOD , " (%d,%d " ,
tmp , hfs_bnode_read_u8 ( node , key_off ) ) ;
2005-04-17 02:20:36 +04:00
hfs_bnode_read ( node , & cnid , key_off + tmp , 4 ) ;
2013-05-01 02:27:54 +04:00
hfs_dbg_cont ( BNODE_MOD , " ,%d) " , be32_to_cpu ( cnid ) ) ;
2005-04-17 02:20:36 +04:00
} else if ( i & & node - > type = = HFS_NODE_LEAF ) {
int tmp ;
tmp = hfs_bnode_read_u8 ( node , key_off ) ;
2013-05-01 02:27:54 +04:00
hfs_dbg_cont ( BNODE_MOD , " (%d) " , tmp ) ;
2005-04-17 02:20:36 +04:00
}
}
2013-05-01 02:27:54 +04:00
hfs_dbg_cont ( BNODE_MOD , " \n " ) ;
2005-04-17 02:20:36 +04:00
}
void hfs_bnode_unlink ( struct hfs_bnode * node )
{
struct hfs_btree * tree ;
struct hfs_bnode * tmp ;
__be32 cnid ;
tree = node - > tree ;
if ( node - > prev ) {
tmp = hfs_bnode_find ( tree , node - > prev ) ;
if ( IS_ERR ( tmp ) )
return ;
tmp - > next = node - > next ;
cnid = cpu_to_be32 ( tmp - > next ) ;
hfs_bnode_write ( tmp , & cnid , offsetof ( struct hfs_bnode_desc , next ) , 4 ) ;
hfs_bnode_put ( tmp ) ;
} else if ( node - > type = = HFS_NODE_LEAF )
tree - > leaf_head = node - > next ;
if ( node - > next ) {
tmp = hfs_bnode_find ( tree , node - > next ) ;
if ( IS_ERR ( tmp ) )
return ;
tmp - > prev = node - > prev ;
cnid = cpu_to_be32 ( tmp - > prev ) ;
hfs_bnode_write ( tmp , & cnid , offsetof ( struct hfs_bnode_desc , prev ) , 4 ) ;
hfs_bnode_put ( tmp ) ;
} else if ( node - > type = = HFS_NODE_LEAF )
tree - > leaf_tail = node - > prev ;
// move down?
if ( ! node - > prev & & ! node - > next ) {
2006-01-19 04:43:07 +03:00
printk ( KERN_DEBUG " hfs_btree_del_level \n " ) ;
2005-04-17 02:20:36 +04:00
}
if ( ! node - > parent ) {
tree - > root = 0 ;
tree - > depth = 0 ;
}
set_bit ( HFS_BNODE_DELETED , & node - > flags ) ;
}
static inline int hfs_bnode_hash ( u32 num )
{
num = ( num > > 16 ) + num ;
num + = num > > 8 ;
return num & ( NODE_HASH_SIZE - 1 ) ;
}
struct hfs_bnode * hfs_bnode_findhash ( struct hfs_btree * tree , u32 cnid )
{
struct hfs_bnode * node ;
if ( cnid > = tree - > node_count ) {
2013-05-01 02:27:55 +04:00
pr_err ( " request for non-existent node %d in B*Tree \n " , cnid ) ;
2005-04-17 02:20:36 +04:00
return NULL ;
}
for ( node = tree - > node_hash [ hfs_bnode_hash ( cnid ) ] ;
node ; node = node - > next_hash ) {
if ( node - > this = = cnid ) {
return node ;
}
}
return NULL ;
}
static struct hfs_bnode * __hfs_bnode_create ( struct hfs_btree * tree , u32 cnid )
{
struct hfs_bnode * node , * node2 ;
struct address_space * mapping ;
struct page * page ;
int size , block , i , hash ;
loff_t off ;
if ( cnid > = tree - > node_count ) {
2013-05-01 02:27:55 +04:00
pr_err ( " request for non-existent node %d in B*Tree \n " , cnid ) ;
2005-04-17 02:20:36 +04:00
return NULL ;
}
size = sizeof ( struct hfs_bnode ) + tree - > pages_per_bnode *
sizeof ( struct page * ) ;
2006-09-27 12:49:37 +04:00
node = kzalloc ( size , GFP_KERNEL ) ;
2005-04-17 02:20:36 +04:00
if ( ! node )
return NULL ;
node - > tree = tree ;
node - > this = cnid ;
set_bit ( HFS_BNODE_NEW , & node - > flags ) ;
atomic_set ( & node - > refcnt , 1 ) ;
2013-05-01 02:27:54 +04:00
hfs_dbg ( BNODE_REFS , " new_node(%d:%d): 1 \n " ,
node - > tree - > cnid , node - > this ) ;
2005-04-17 02:20:36 +04:00
init_waitqueue_head ( & node - > lock_wq ) ;
spin_lock ( & tree - > hash_lock ) ;
node2 = hfs_bnode_findhash ( tree , cnid ) ;
if ( ! node2 ) {
hash = hfs_bnode_hash ( cnid ) ;
node - > next_hash = tree - > node_hash [ hash ] ;
tree - > node_hash [ hash ] = node ;
tree - > node_hash_cnt + + ;
} else {
spin_unlock ( & tree - > hash_lock ) ;
kfree ( node ) ;
wait_event ( node2 - > lock_wq , ! test_bit ( HFS_BNODE_NEW , & node2 - > flags ) ) ;
return node2 ;
}
spin_unlock ( & tree - > hash_lock ) ;
mapping = tree - > inode - > i_mapping ;
off = ( loff_t ) cnid * tree - > node_size ;
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
ago with promise that one day it will be possible to implement page
cache with bigger chunks than PAGE_SIZE.
This promise never materialized. And unlikely will.
We have many places where PAGE_CACHE_SIZE assumed to be equal to
PAGE_SIZE. And it's constant source of confusion on whether
PAGE_CACHE_* or PAGE_* constant should be used in a particular case,
especially on the border between fs and mm.
Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much
breakage to be doable.
Let's stop pretending that pages in page cache are special. They are
not.
The changes are pretty straight-forward:
- <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- <foo> >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};
- page_cache_get() -> get_page();
- page_cache_release() -> put_page();
This patch contains automated changes generated with coccinelle using
script below. For some reason, coccinelle doesn't patch header files.
I've called spatch for them manually.
The only adjustment after coccinelle is revert of changes to
PAGE_CAHCE_ALIGN definition: we are going to drop it later.
There are few places in the code where coccinelle didn't reach. I'll
fix them manually in a separate patch. Comments and documentation also
will be addressed with the separate patch.
virtual patch
@@
expression E;
@@
- E << (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
expression E;
@@
- E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
@@
- PAGE_CACHE_SHIFT
+ PAGE_SHIFT
@@
@@
- PAGE_CACHE_SIZE
+ PAGE_SIZE
@@
@@
- PAGE_CACHE_MASK
+ PAGE_MASK
@@
expression E;
@@
- PAGE_CACHE_ALIGN(E)
+ PAGE_ALIGN(E)
@@
expression E;
@@
- page_cache_get(E)
+ get_page(E)
@@
expression E;
@@
- page_cache_release(E)
+ put_page(E)
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2016-04-01 15:29:47 +03:00
block = off > > PAGE_SHIFT ;
node - > page_offset = off & ~ PAGE_MASK ;
2005-04-17 02:20:36 +04:00
for ( i = 0 ; i < tree - > pages_per_bnode ; i + + ) {
2006-06-23 13:05:08 +04:00
page = read_mapping_page ( mapping , block + + , NULL ) ;
2005-04-17 02:20:36 +04:00
if ( IS_ERR ( page ) )
goto fail ;
if ( PageError ( page ) ) {
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
ago with promise that one day it will be possible to implement page
cache with bigger chunks than PAGE_SIZE.
This promise never materialized. And unlikely will.
We have many places where PAGE_CACHE_SIZE assumed to be equal to
PAGE_SIZE. And it's constant source of confusion on whether
PAGE_CACHE_* or PAGE_* constant should be used in a particular case,
especially on the border between fs and mm.
Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much
breakage to be doable.
Let's stop pretending that pages in page cache are special. They are
not.
The changes are pretty straight-forward:
- <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- <foo> >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};
- page_cache_get() -> get_page();
- page_cache_release() -> put_page();
This patch contains automated changes generated with coccinelle using
script below. For some reason, coccinelle doesn't patch header files.
I've called spatch for them manually.
The only adjustment after coccinelle is revert of changes to
PAGE_CAHCE_ALIGN definition: we are going to drop it later.
There are few places in the code where coccinelle didn't reach. I'll
fix them manually in a separate patch. Comments and documentation also
will be addressed with the separate patch.
virtual patch
@@
expression E;
@@
- E << (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
expression E;
@@
- E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
@@
- PAGE_CACHE_SHIFT
+ PAGE_SHIFT
@@
@@
- PAGE_CACHE_SIZE
+ PAGE_SIZE
@@
@@
- PAGE_CACHE_MASK
+ PAGE_MASK
@@
expression E;
@@
- PAGE_CACHE_ALIGN(E)
+ PAGE_ALIGN(E)
@@
expression E;
@@
- page_cache_get(E)
+ get_page(E)
@@
expression E;
@@
- page_cache_release(E)
+ put_page(E)
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2016-04-01 15:29:47 +03:00
put_page ( page ) ;
2005-04-17 02:20:36 +04:00
goto fail ;
}
node - > page [ i ] = page ;
}
return node ;
fail :
set_bit ( HFS_BNODE_ERROR , & node - > flags ) ;
return node ;
}
void hfs_bnode_unhash ( struct hfs_bnode * node )
{
struct hfs_bnode * * p ;
2013-05-01 02:27:54 +04:00
hfs_dbg ( BNODE_REFS , " remove_node(%d:%d): %d \n " ,
2005-04-17 02:20:36 +04:00
node - > tree - > cnid , node - > this , atomic_read ( & node - > refcnt ) ) ;
for ( p = & node - > tree - > node_hash [ hfs_bnode_hash ( node - > this ) ] ;
* p & & * p ! = node ; p = & ( * p ) - > next_hash )
;
2006-03-26 20:26:51 +04:00
BUG_ON ( ! * p ) ;
2005-04-17 02:20:36 +04:00
* p = node - > next_hash ;
node - > tree - > node_hash_cnt - - ;
}
/* Load a particular node out of a tree */
struct hfs_bnode * hfs_bnode_find ( struct hfs_btree * tree , u32 num )
{
struct hfs_bnode * node ;
struct hfs_bnode_desc * desc ;
int i , rec_off , off , next_off ;
int entry_size , key_size ;
spin_lock ( & tree - > hash_lock ) ;
node = hfs_bnode_findhash ( tree , num ) ;
if ( node ) {
hfs_bnode_get ( node ) ;
spin_unlock ( & tree - > hash_lock ) ;
wait_event ( node - > lock_wq , ! test_bit ( HFS_BNODE_NEW , & node - > flags ) ) ;
if ( test_bit ( HFS_BNODE_ERROR , & node - > flags ) )
goto node_error ;
return node ;
}
spin_unlock ( & tree - > hash_lock ) ;
node = __hfs_bnode_create ( tree , num ) ;
if ( ! node )
return ERR_PTR ( - ENOMEM ) ;
if ( test_bit ( HFS_BNODE_ERROR , & node - > flags ) )
goto node_error ;
if ( ! test_bit ( HFS_BNODE_NEW , & node - > flags ) )
return node ;
desc = ( struct hfs_bnode_desc * ) ( kmap ( node - > page [ 0 ] ) + node - > page_offset ) ;
node - > prev = be32_to_cpu ( desc - > prev ) ;
node - > next = be32_to_cpu ( desc - > next ) ;
node - > num_recs = be16_to_cpu ( desc - > num_recs ) ;
node - > type = desc - > type ;
node - > height = desc - > height ;
kunmap ( node - > page [ 0 ] ) ;
switch ( node - > type ) {
case HFS_NODE_HEADER :
case HFS_NODE_MAP :
if ( node - > height ! = 0 )
goto node_error ;
break ;
case HFS_NODE_LEAF :
if ( node - > height ! = 1 )
goto node_error ;
break ;
case HFS_NODE_INDEX :
if ( node - > height < = 1 | | node - > height > tree - > depth )
goto node_error ;
break ;
default :
goto node_error ;
}
rec_off = tree - > node_size - 2 ;
off = hfs_bnode_read_u16 ( node , rec_off ) ;
if ( off ! = sizeof ( struct hfs_bnode_desc ) )
goto node_error ;
for ( i = 1 ; i < = node - > num_recs ; off = next_off , i + + ) {
rec_off - = 2 ;
next_off = hfs_bnode_read_u16 ( node , rec_off ) ;
if ( next_off < = off | |
next_off > tree - > node_size | |
next_off & 1 )
goto node_error ;
entry_size = next_off - off ;
if ( node - > type ! = HFS_NODE_INDEX & &
node - > type ! = HFS_NODE_LEAF )
continue ;
key_size = hfs_bnode_read_u8 ( node , off ) + 1 ;
if ( key_size > = entry_size /*|| key_size & 1*/ )
goto node_error ;
}
clear_bit ( HFS_BNODE_NEW , & node - > flags ) ;
wake_up ( & node - > lock_wq ) ;
return node ;
node_error :
set_bit ( HFS_BNODE_ERROR , & node - > flags ) ;
clear_bit ( HFS_BNODE_NEW , & node - > flags ) ;
wake_up ( & node - > lock_wq ) ;
hfs_bnode_put ( node ) ;
return ERR_PTR ( - EIO ) ;
}
void hfs_bnode_free ( struct hfs_bnode * node )
{
hfs,hfsplus: cache pages correctly between bnode_create and bnode_free
Pages looked up by __hfs_bnode_create() (called by hfs_bnode_create() and
hfs_bnode_find() for finding or creating pages corresponding to an inode)
are immediately kmap()'ed and used (both read and write) and kunmap()'ed,
and should not be page_cache_release()'ed until hfs_bnode_free().
This patch fixes a problem I first saw in July 2012: merely running "du"
on a large hfsplus-mounted directory a few times on a reasonably loaded
system would get the hfsplus driver all confused and complaining about
B-tree inconsistencies, and generates a "BUG: Bad page state". Most
recently, I can generate this problem on up-to-date Fedora 22 with shipped
kernel 4.0.5, by running "du /" (="/" + "/home" + "/mnt" + other smaller
mounts) and "du /mnt" simultaneously on two windows, where /mnt is a
lightly-used QEMU VM image of the full Mac OS X 10.9:
$ df -i / /home /mnt
Filesystem Inodes IUsed IFree IUse% Mounted on
/dev/mapper/fedora-root 3276800 551665 2725135 17% /
/dev/mapper/fedora-home 52879360 716221 52163139 2% /home
/dev/nbd0p2 4294967295 1387818 4293579477 1% /mnt
After applying the patch, I was able to run "du /" (60+ times) and "du
/mnt" (150+ times) continuously and simultaneously for 6+ hours.
There are many reports of the hfsplus driver getting confused under load
and generating "BUG: Bad page state" or other similar issues over the
years. [1]
The unpatched code [2] has always been wrong since it entered the kernel
tree. The only reason why it gets away with it is that the
kmap/memcpy/kunmap follow very quickly after the page_cache_release() so
the kernel has not had a chance to reuse the memory for something else,
most of the time.
The current RW driver appears to have followed the design and development
of the earlier read-only hfsplus driver [3], where-by version 0.1 (Dec
2001) had a B-tree node-centric approach to
read_cache_page()/page_cache_release() per bnode_get()/bnode_put(),
migrating towards version 0.2 (June 2002) of caching and releasing pages
per inode extents. When the current RW code first entered the kernel [2]
in 2005, there was an REF_PAGES conditional (and "//" commented out code)
to switch between B-node centric paging to inode-centric paging. There
was a mistake with the direction of one of the REF_PAGES conditionals in
__hfs_bnode_create(). In a subsequent "remove debug code" commit [4], the
read_cache_page()/page_cache_release() per bnode_get()/bnode_put() were
removed, but a page_cache_release() was mistakenly left in (propagating
the "REF_PAGES <-> !REF_PAGE" mistake), and the commented-out
page_cache_release() in bnode_release() (which should be spanned by
!REF_PAGES) was never enabled.
References:
[1]:
Michael Fox, Apr 2013
http://www.spinics.net/lists/linux-fsdevel/msg63807.html
("hfsplus volume suddenly inaccessable after 'hfs: recoff %d too large'")
Sasha Levin, Feb 2015
http://lkml.org/lkml/2015/2/20/85 ("use after free")
https://bugs.launchpad.net/ubuntu/+source/linux/+bug/740814
https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1027887
https://bugzilla.kernel.org/show_bug.cgi?id=42342
https://bugzilla.kernel.org/show_bug.cgi?id=63841
https://bugzilla.kernel.org/show_bug.cgi?id=78761
[2]:
http://git.kernel.org/cgit/linux/kernel/git/tglx/history.git/commit/\
fs/hfs/bnode.c?id=d1081202f1d0ee35ab0beb490da4b65d4bc763db
commit d1081202f1d0ee35ab0beb490da4b65d4bc763db
Author: Andrew Morton <akpm@osdl.org>
Date: Wed Feb 25 16:17:36 2004 -0800
[PATCH] HFS rewrite
http://git.kernel.org/cgit/linux/kernel/git/tglx/history.git/commit/\
fs/hfsplus/bnode.c?id=91556682e0bf004d98a529bf829d339abb98bbbd
commit 91556682e0bf004d98a529bf829d339abb98bbbd
Author: Andrew Morton <akpm@osdl.org>
Date: Wed Feb 25 16:17:48 2004 -0800
[PATCH] HFS+ support
[3]:
http://sourceforge.net/projects/linux-hfsplus/
http://sourceforge.net/projects/linux-hfsplus/files/Linux%202.4.x%20patch/hfsplus%200.1/
http://sourceforge.net/projects/linux-hfsplus/files/Linux%202.4.x%20patch/hfsplus%200.2/
http://linux-hfsplus.cvs.sourceforge.net/viewvc/linux-hfsplus/linux/\
fs/hfsplus/bnode.c?r1=1.4&r2=1.5
Date: Thu Jun 6 09:45:14 2002 +0000
Use buffer cache instead of page cache in bnode.c. Cache inode extents.
[4]:
http://git.kernel.org/cgit/linux/kernel/git/\
stable/linux-stable.git/commit/?id=a5e3985fa014029eb6795664c704953720cc7f7d
commit a5e3985fa014029eb6795664c704953720cc7f7d
Author: Roman Zippel <zippel@linux-m68k.org>
Date: Tue Sep 6 15:18:47 2005 -0700
[PATCH] hfs: remove debug code
Signed-off-by: Hin-Tak Leung <htl10@users.sourceforge.net>
Signed-off-by: Sergei Antonov <saproj@gmail.com>
Reviewed-by: Anton Altaparmakov <anton@tuxera.com>
Reported-by: Sasha Levin <sasha.levin@oracle.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Vyacheslav Dubeyko <slava@dubeyko.com>
Cc: Sougata Santra <sougata@tuxera.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2015-09-10 01:38:04 +03:00
int i ;
2005-04-17 02:20:36 +04:00
hfs,hfsplus: cache pages correctly between bnode_create and bnode_free
Pages looked up by __hfs_bnode_create() (called by hfs_bnode_create() and
hfs_bnode_find() for finding or creating pages corresponding to an inode)
are immediately kmap()'ed and used (both read and write) and kunmap()'ed,
and should not be page_cache_release()'ed until hfs_bnode_free().
This patch fixes a problem I first saw in July 2012: merely running "du"
on a large hfsplus-mounted directory a few times on a reasonably loaded
system would get the hfsplus driver all confused and complaining about
B-tree inconsistencies, and generates a "BUG: Bad page state". Most
recently, I can generate this problem on up-to-date Fedora 22 with shipped
kernel 4.0.5, by running "du /" (="/" + "/home" + "/mnt" + other smaller
mounts) and "du /mnt" simultaneously on two windows, where /mnt is a
lightly-used QEMU VM image of the full Mac OS X 10.9:
$ df -i / /home /mnt
Filesystem Inodes IUsed IFree IUse% Mounted on
/dev/mapper/fedora-root 3276800 551665 2725135 17% /
/dev/mapper/fedora-home 52879360 716221 52163139 2% /home
/dev/nbd0p2 4294967295 1387818 4293579477 1% /mnt
After applying the patch, I was able to run "du /" (60+ times) and "du
/mnt" (150+ times) continuously and simultaneously for 6+ hours.
There are many reports of the hfsplus driver getting confused under load
and generating "BUG: Bad page state" or other similar issues over the
years. [1]
The unpatched code [2] has always been wrong since it entered the kernel
tree. The only reason why it gets away with it is that the
kmap/memcpy/kunmap follow very quickly after the page_cache_release() so
the kernel has not had a chance to reuse the memory for something else,
most of the time.
The current RW driver appears to have followed the design and development
of the earlier read-only hfsplus driver [3], where-by version 0.1 (Dec
2001) had a B-tree node-centric approach to
read_cache_page()/page_cache_release() per bnode_get()/bnode_put(),
migrating towards version 0.2 (June 2002) of caching and releasing pages
per inode extents. When the current RW code first entered the kernel [2]
in 2005, there was an REF_PAGES conditional (and "//" commented out code)
to switch between B-node centric paging to inode-centric paging. There
was a mistake with the direction of one of the REF_PAGES conditionals in
__hfs_bnode_create(). In a subsequent "remove debug code" commit [4], the
read_cache_page()/page_cache_release() per bnode_get()/bnode_put() were
removed, but a page_cache_release() was mistakenly left in (propagating
the "REF_PAGES <-> !REF_PAGE" mistake), and the commented-out
page_cache_release() in bnode_release() (which should be spanned by
!REF_PAGES) was never enabled.
References:
[1]:
Michael Fox, Apr 2013
http://www.spinics.net/lists/linux-fsdevel/msg63807.html
("hfsplus volume suddenly inaccessable after 'hfs: recoff %d too large'")
Sasha Levin, Feb 2015
http://lkml.org/lkml/2015/2/20/85 ("use after free")
https://bugs.launchpad.net/ubuntu/+source/linux/+bug/740814
https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1027887
https://bugzilla.kernel.org/show_bug.cgi?id=42342
https://bugzilla.kernel.org/show_bug.cgi?id=63841
https://bugzilla.kernel.org/show_bug.cgi?id=78761
[2]:
http://git.kernel.org/cgit/linux/kernel/git/tglx/history.git/commit/\
fs/hfs/bnode.c?id=d1081202f1d0ee35ab0beb490da4b65d4bc763db
commit d1081202f1d0ee35ab0beb490da4b65d4bc763db
Author: Andrew Morton <akpm@osdl.org>
Date: Wed Feb 25 16:17:36 2004 -0800
[PATCH] HFS rewrite
http://git.kernel.org/cgit/linux/kernel/git/tglx/history.git/commit/\
fs/hfsplus/bnode.c?id=91556682e0bf004d98a529bf829d339abb98bbbd
commit 91556682e0bf004d98a529bf829d339abb98bbbd
Author: Andrew Morton <akpm@osdl.org>
Date: Wed Feb 25 16:17:48 2004 -0800
[PATCH] HFS+ support
[3]:
http://sourceforge.net/projects/linux-hfsplus/
http://sourceforge.net/projects/linux-hfsplus/files/Linux%202.4.x%20patch/hfsplus%200.1/
http://sourceforge.net/projects/linux-hfsplus/files/Linux%202.4.x%20patch/hfsplus%200.2/
http://linux-hfsplus.cvs.sourceforge.net/viewvc/linux-hfsplus/linux/\
fs/hfsplus/bnode.c?r1=1.4&r2=1.5
Date: Thu Jun 6 09:45:14 2002 +0000
Use buffer cache instead of page cache in bnode.c. Cache inode extents.
[4]:
http://git.kernel.org/cgit/linux/kernel/git/\
stable/linux-stable.git/commit/?id=a5e3985fa014029eb6795664c704953720cc7f7d
commit a5e3985fa014029eb6795664c704953720cc7f7d
Author: Roman Zippel <zippel@linux-m68k.org>
Date: Tue Sep 6 15:18:47 2005 -0700
[PATCH] hfs: remove debug code
Signed-off-by: Hin-Tak Leung <htl10@users.sourceforge.net>
Signed-off-by: Sergei Antonov <saproj@gmail.com>
Reviewed-by: Anton Altaparmakov <anton@tuxera.com>
Reported-by: Sasha Levin <sasha.levin@oracle.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Vyacheslav Dubeyko <slava@dubeyko.com>
Cc: Sougata Santra <sougata@tuxera.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2015-09-10 01:38:04 +03:00
for ( i = 0 ; i < node - > tree - > pages_per_bnode ; i + + )
if ( node - > page [ i ] )
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
ago with promise that one day it will be possible to implement page
cache with bigger chunks than PAGE_SIZE.
This promise never materialized. And unlikely will.
We have many places where PAGE_CACHE_SIZE assumed to be equal to
PAGE_SIZE. And it's constant source of confusion on whether
PAGE_CACHE_* or PAGE_* constant should be used in a particular case,
especially on the border between fs and mm.
Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much
breakage to be doable.
Let's stop pretending that pages in page cache are special. They are
not.
The changes are pretty straight-forward:
- <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- <foo> >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};
- page_cache_get() -> get_page();
- page_cache_release() -> put_page();
This patch contains automated changes generated with coccinelle using
script below. For some reason, coccinelle doesn't patch header files.
I've called spatch for them manually.
The only adjustment after coccinelle is revert of changes to
PAGE_CAHCE_ALIGN definition: we are going to drop it later.
There are few places in the code where coccinelle didn't reach. I'll
fix them manually in a separate patch. Comments and documentation also
will be addressed with the separate patch.
virtual patch
@@
expression E;
@@
- E << (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
expression E;
@@
- E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
@@
- PAGE_CACHE_SHIFT
+ PAGE_SHIFT
@@
@@
- PAGE_CACHE_SIZE
+ PAGE_SIZE
@@
@@
- PAGE_CACHE_MASK
+ PAGE_MASK
@@
expression E;
@@
- PAGE_CACHE_ALIGN(E)
+ PAGE_ALIGN(E)
@@
expression E;
@@
- page_cache_get(E)
+ get_page(E)
@@
expression E;
@@
- page_cache_release(E)
+ put_page(E)
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2016-04-01 15:29:47 +03:00
put_page ( node - > page [ i ] ) ;
2005-04-17 02:20:36 +04:00
kfree ( node ) ;
}
struct hfs_bnode * hfs_bnode_create ( struct hfs_btree * tree , u32 num )
{
struct hfs_bnode * node ;
struct page * * pagep ;
int i ;
spin_lock ( & tree - > hash_lock ) ;
node = hfs_bnode_findhash ( tree , num ) ;
spin_unlock ( & tree - > hash_lock ) ;
2013-05-25 02:55:16 +04:00
if ( node ) {
pr_crit ( " new node %u already hashed? \n " , num ) ;
WARN_ON ( 1 ) ;
return node ;
}
2005-04-17 02:20:36 +04:00
node = __hfs_bnode_create ( tree , num ) ;
if ( ! node )
return ERR_PTR ( - ENOMEM ) ;
if ( test_bit ( HFS_BNODE_ERROR , & node - > flags ) ) {
hfs_bnode_put ( node ) ;
return ERR_PTR ( - EIO ) ;
}
pagep = node - > page ;
memset ( kmap ( * pagep ) + node - > page_offset , 0 ,
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
ago with promise that one day it will be possible to implement page
cache with bigger chunks than PAGE_SIZE.
This promise never materialized. And unlikely will.
We have many places where PAGE_CACHE_SIZE assumed to be equal to
PAGE_SIZE. And it's constant source of confusion on whether
PAGE_CACHE_* or PAGE_* constant should be used in a particular case,
especially on the border between fs and mm.
Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much
breakage to be doable.
Let's stop pretending that pages in page cache are special. They are
not.
The changes are pretty straight-forward:
- <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- <foo> >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};
- page_cache_get() -> get_page();
- page_cache_release() -> put_page();
This patch contains automated changes generated with coccinelle using
script below. For some reason, coccinelle doesn't patch header files.
I've called spatch for them manually.
The only adjustment after coccinelle is revert of changes to
PAGE_CAHCE_ALIGN definition: we are going to drop it later.
There are few places in the code where coccinelle didn't reach. I'll
fix them manually in a separate patch. Comments and documentation also
will be addressed with the separate patch.
virtual patch
@@
expression E;
@@
- E << (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
expression E;
@@
- E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
@@
- PAGE_CACHE_SHIFT
+ PAGE_SHIFT
@@
@@
- PAGE_CACHE_SIZE
+ PAGE_SIZE
@@
@@
- PAGE_CACHE_MASK
+ PAGE_MASK
@@
expression E;
@@
- PAGE_CACHE_ALIGN(E)
+ PAGE_ALIGN(E)
@@
expression E;
@@
- page_cache_get(E)
+ get_page(E)
@@
expression E;
@@
- page_cache_release(E)
+ put_page(E)
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2016-04-01 15:29:47 +03:00
min ( ( int ) PAGE_SIZE , ( int ) tree - > node_size ) ) ;
2005-04-17 02:20:36 +04:00
set_page_dirty ( * pagep ) ;
kunmap ( * pagep ) ;
for ( i = 1 ; i < tree - > pages_per_bnode ; i + + ) {
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
ago with promise that one day it will be possible to implement page
cache with bigger chunks than PAGE_SIZE.
This promise never materialized. And unlikely will.
We have many places where PAGE_CACHE_SIZE assumed to be equal to
PAGE_SIZE. And it's constant source of confusion on whether
PAGE_CACHE_* or PAGE_* constant should be used in a particular case,
especially on the border between fs and mm.
Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much
breakage to be doable.
Let's stop pretending that pages in page cache are special. They are
not.
The changes are pretty straight-forward:
- <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- <foo> >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};
- page_cache_get() -> get_page();
- page_cache_release() -> put_page();
This patch contains automated changes generated with coccinelle using
script below. For some reason, coccinelle doesn't patch header files.
I've called spatch for them manually.
The only adjustment after coccinelle is revert of changes to
PAGE_CAHCE_ALIGN definition: we are going to drop it later.
There are few places in the code where coccinelle didn't reach. I'll
fix them manually in a separate patch. Comments and documentation also
will be addressed with the separate patch.
virtual patch
@@
expression E;
@@
- E << (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
expression E;
@@
- E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
@@
- PAGE_CACHE_SHIFT
+ PAGE_SHIFT
@@
@@
- PAGE_CACHE_SIZE
+ PAGE_SIZE
@@
@@
- PAGE_CACHE_MASK
+ PAGE_MASK
@@
expression E;
@@
- PAGE_CACHE_ALIGN(E)
+ PAGE_ALIGN(E)
@@
expression E;
@@
- page_cache_get(E)
+ get_page(E)
@@
expression E;
@@
- page_cache_release(E)
+ put_page(E)
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2016-04-01 15:29:47 +03:00
memset ( kmap ( * + + pagep ) , 0 , PAGE_SIZE ) ;
2005-04-17 02:20:36 +04:00
set_page_dirty ( * pagep ) ;
kunmap ( * pagep ) ;
}
clear_bit ( HFS_BNODE_NEW , & node - > flags ) ;
wake_up ( & node - > lock_wq ) ;
return node ;
}
void hfs_bnode_get ( struct hfs_bnode * node )
{
if ( node ) {
atomic_inc ( & node - > refcnt ) ;
2013-05-01 02:27:54 +04:00
hfs_dbg ( BNODE_REFS , " get_node(%d:%d): %d \n " ,
node - > tree - > cnid , node - > this ,
atomic_read ( & node - > refcnt ) ) ;
2005-04-17 02:20:36 +04:00
}
}
/* Dispose of resources used by a node */
void hfs_bnode_put ( struct hfs_bnode * node )
{
if ( node ) {
struct hfs_btree * tree = node - > tree ;
int i ;
2013-05-01 02:27:54 +04:00
hfs_dbg ( BNODE_REFS , " put_node(%d:%d): %d \n " ,
node - > tree - > cnid , node - > this ,
atomic_read ( & node - > refcnt ) ) ;
2006-03-26 20:26:51 +04:00
BUG_ON ( ! atomic_read ( & node - > refcnt ) ) ;
2005-09-07 02:18:47 +04:00
if ( ! atomic_dec_and_lock ( & node - > refcnt , & tree - > hash_lock ) )
2005-04-17 02:20:36 +04:00
return ;
for ( i = 0 ; i < tree - > pages_per_bnode ; i + + ) {
2005-08-02 08:11:41 +04:00
if ( ! node - > page [ i ] )
continue ;
2005-04-17 02:20:36 +04:00
mark_page_accessed ( node - > page [ i ] ) ;
}
if ( test_bit ( HFS_BNODE_DELETED , & node - > flags ) ) {
hfs_bnode_unhash ( node ) ;
spin_unlock ( & tree - > hash_lock ) ;
hfs_bmap_free ( node ) ;
hfs_bnode_free ( node ) ;
return ;
}
spin_unlock ( & tree - > hash_lock ) ;
}
}