2009-04-07 06:01:25 +04:00
|
|
|
/*
|
|
|
|
* btnode.c - NILFS B-tree node cache
|
|
|
|
*
|
|
|
|
* Copyright (C) 2005-2008 Nippon Telegraph and Telephone Corporation.
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
|
|
* (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
2016-05-24 02:23:09 +03:00
|
|
|
* Originally written by Seiji Kihara.
|
|
|
|
* Fully revised by Ryusuke Konishi for stabilization and simplification.
|
2009-04-07 06:01:25 +04:00
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/types.h>
|
|
|
|
#include <linux/buffer_head.h>
|
|
|
|
#include <linux/mm.h>
|
|
|
|
#include <linux/backing-dev.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/gfp.h>
|
2009-04-07 06:01:25 +04:00
|
|
|
#include "nilfs.h"
|
|
|
|
#include "mdt.h"
|
|
|
|
#include "dat.h"
|
|
|
|
#include "page.h"
|
|
|
|
#include "btnode.h"
|
|
|
|
|
|
|
|
void nilfs_btnode_cache_clear(struct address_space *btnc)
|
|
|
|
{
|
|
|
|
invalidate_mapping_pages(btnc, 0, -1);
|
|
|
|
truncate_inode_pages(btnc, 0);
|
|
|
|
}
|
|
|
|
|
2009-11-13 10:04:11 +03:00
|
|
|
struct buffer_head *
|
|
|
|
nilfs_btnode_create_block(struct address_space *btnc, __u64 blocknr)
|
|
|
|
{
|
|
|
|
struct inode *inode = NILFS_BTNC_I(btnc);
|
|
|
|
struct buffer_head *bh;
|
|
|
|
|
2016-08-03 00:05:28 +03:00
|
|
|
bh = nilfs_grab_buffer(inode, btnc, blocknr, BIT(BH_NILFS_Node));
|
2009-11-13 10:04:11 +03:00
|
|
|
if (unlikely(!bh))
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
if (unlikely(buffer_mapped(bh) || buffer_uptodate(bh) ||
|
|
|
|
buffer_dirty(bh))) {
|
|
|
|
brelse(bh);
|
|
|
|
BUG();
|
|
|
|
}
|
|
|
|
memset(bh->b_data, 0, 1 << inode->i_blkbits);
|
2011-05-05 07:56:51 +04:00
|
|
|
bh->b_bdev = inode->i_sb->s_bdev;
|
2009-11-13 10:04:11 +03:00
|
|
|
bh->b_blocknr = blocknr;
|
|
|
|
set_buffer_mapped(bh);
|
|
|
|
set_buffer_uptodate(bh);
|
|
|
|
|
|
|
|
unlock_page(bh->b_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(bh->b_page);
|
2009-11-13 10:04:11 +03:00
|
|
|
return bh;
|
|
|
|
}
|
|
|
|
|
2009-04-07 06:01:25 +04:00
|
|
|
int nilfs_btnode_submit_block(struct address_space *btnc, __u64 blocknr,
|
2016-06-05 22:31:43 +03:00
|
|
|
sector_t pblocknr, int mode, int mode_flags,
|
2010-07-18 05:42:23 +04:00
|
|
|
struct buffer_head **pbh, sector_t *submit_ptr)
|
2009-04-07 06:01:25 +04:00
|
|
|
{
|
|
|
|
struct buffer_head *bh;
|
|
|
|
struct inode *inode = NILFS_BTNC_I(btnc);
|
2010-07-15 06:39:10 +04:00
|
|
|
struct page *page;
|
2009-04-07 06:01:25 +04:00
|
|
|
int err;
|
|
|
|
|
2016-08-03 00:05:28 +03:00
|
|
|
bh = nilfs_grab_buffer(inode, btnc, blocknr, BIT(BH_NILFS_Node));
|
2009-04-07 06:01:25 +04:00
|
|
|
if (unlikely(!bh))
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
err = -EEXIST; /* internal code */
|
2010-07-15 06:39:10 +04:00
|
|
|
page = bh->b_page;
|
2009-04-07 06:01:25 +04:00
|
|
|
|
|
|
|
if (buffer_uptodate(bh) || buffer_dirty(bh))
|
|
|
|
goto found;
|
|
|
|
|
|
|
|
if (pblocknr == 0) {
|
|
|
|
pblocknr = blocknr;
|
|
|
|
if (inode->i_ino != NILFS_DAT_INO) {
|
2011-05-05 07:56:51 +04:00
|
|
|
struct the_nilfs *nilfs = inode->i_sb->s_fs_info;
|
2009-04-07 06:01:25 +04:00
|
|
|
|
|
|
|
/* blocknr is a virtual block number */
|
2011-05-05 07:56:51 +04:00
|
|
|
err = nilfs_dat_translate(nilfs->ns_dat, blocknr,
|
|
|
|
&pblocknr);
|
2009-04-07 06:01:25 +04:00
|
|
|
if (unlikely(err)) {
|
|
|
|
brelse(bh);
|
|
|
|
goto out_locked;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2010-07-18 05:42:23 +04:00
|
|
|
|
2016-06-05 22:31:43 +03:00
|
|
|
if (mode_flags & REQ_RAHEAD) {
|
2010-07-18 05:42:23 +04:00
|
|
|
if (pblocknr != *submit_ptr + 1 || !trylock_buffer(bh)) {
|
|
|
|
err = -EBUSY; /* internal code */
|
|
|
|
brelse(bh);
|
|
|
|
goto out_locked;
|
|
|
|
}
|
|
|
|
} else { /* mode == READ */
|
|
|
|
lock_buffer(bh);
|
|
|
|
}
|
2009-04-07 06:01:25 +04:00
|
|
|
if (buffer_uptodate(bh)) {
|
|
|
|
unlock_buffer(bh);
|
|
|
|
err = -EEXIST; /* internal code */
|
|
|
|
goto found;
|
|
|
|
}
|
|
|
|
set_buffer_mapped(bh);
|
2011-05-05 07:56:51 +04:00
|
|
|
bh->b_bdev = inode->i_sb->s_bdev;
|
2009-04-07 06:01:25 +04:00
|
|
|
bh->b_blocknr = pblocknr; /* set block address for read */
|
|
|
|
bh->b_end_io = end_buffer_read_sync;
|
|
|
|
get_bh(bh);
|
2016-06-05 22:31:43 +03:00
|
|
|
submit_bh(mode, mode_flags, bh);
|
2009-04-07 06:01:25 +04:00
|
|
|
bh->b_blocknr = blocknr; /* set back to the given block address */
|
2010-07-18 05:42:23 +04:00
|
|
|
*submit_ptr = pblocknr;
|
2009-04-07 06:01:25 +04:00
|
|
|
err = 0;
|
|
|
|
found:
|
|
|
|
*pbh = bh;
|
|
|
|
|
|
|
|
out_locked:
|
2010-07-15 06:39:10 +04:00
|
|
|
unlock_page(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);
|
2009-04-07 06:01:25 +04:00
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* nilfs_btnode_delete - delete B-tree node buffer
|
|
|
|
* @bh: buffer to be deleted
|
|
|
|
*
|
|
|
|
* nilfs_btnode_delete() invalidates the specified buffer and delete the page
|
|
|
|
* including the buffer if the page gets unbusy.
|
|
|
|
*/
|
|
|
|
void nilfs_btnode_delete(struct buffer_head *bh)
|
|
|
|
{
|
|
|
|
struct address_space *mapping;
|
|
|
|
struct page *page = bh->b_page;
|
|
|
|
pgoff_t index = page_index(page);
|
|
|
|
int still_dirty;
|
|
|
|
|
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
|
|
|
get_page(page);
|
2009-04-07 06:01:25 +04:00
|
|
|
lock_page(page);
|
|
|
|
wait_on_page_writeback(page);
|
|
|
|
|
|
|
|
nilfs_forget_buffer(bh);
|
|
|
|
still_dirty = PageDirty(page);
|
|
|
|
mapping = page->mapping;
|
|
|
|
unlock_page(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);
|
2009-04-07 06:01:25 +04:00
|
|
|
|
|
|
|
if (!still_dirty && mapping)
|
|
|
|
invalidate_inode_pages2_range(mapping, index, index);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* nilfs_btnode_prepare_change_key
|
|
|
|
* prepare to move contents of the block for old key to one of new key.
|
|
|
|
* the old buffer will not be removed, but might be reused for new buffer.
|
|
|
|
* it might return -ENOMEM because of memory allocation errors,
|
|
|
|
* and might return -EIO because of disk read errors.
|
|
|
|
*/
|
|
|
|
int nilfs_btnode_prepare_change_key(struct address_space *btnc,
|
|
|
|
struct nilfs_btnode_chkey_ctxt *ctxt)
|
|
|
|
{
|
|
|
|
struct buffer_head *obh, *nbh;
|
|
|
|
struct inode *inode = NILFS_BTNC_I(btnc);
|
|
|
|
__u64 oldkey = ctxt->oldkey, newkey = ctxt->newkey;
|
|
|
|
int err;
|
|
|
|
|
|
|
|
if (oldkey == newkey)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
obh = ctxt->bh;
|
|
|
|
ctxt->newbh = NULL;
|
|
|
|
|
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
|
|
|
if (inode->i_blkbits == PAGE_SHIFT) {
|
2009-04-07 06:01:25 +04:00
|
|
|
lock_page(obh->b_page);
|
|
|
|
/*
|
|
|
|
* We cannot call radix_tree_preload for the kernels older
|
|
|
|
* than 2.6.23, because it is not exported for modules.
|
|
|
|
*/
|
2009-08-29 23:21:41 +04:00
|
|
|
retry:
|
2009-04-07 06:01:25 +04:00
|
|
|
err = radix_tree_preload(GFP_NOFS & ~__GFP_HIGHMEM);
|
|
|
|
if (err)
|
|
|
|
goto failed_unlock;
|
|
|
|
/* BUG_ON(oldkey != obh->b_page->index); */
|
|
|
|
if (unlikely(oldkey != obh->b_page->index))
|
|
|
|
NILFS_PAGE_BUG(obh->b_page,
|
|
|
|
"invalid oldkey %lld (newkey=%lld)",
|
|
|
|
(unsigned long long)oldkey,
|
|
|
|
(unsigned long long)newkey);
|
|
|
|
|
|
|
|
spin_lock_irq(&btnc->tree_lock);
|
|
|
|
err = radix_tree_insert(&btnc->page_tree, newkey, obh->b_page);
|
|
|
|
spin_unlock_irq(&btnc->tree_lock);
|
|
|
|
/*
|
|
|
|
* Note: page->index will not change to newkey until
|
|
|
|
* nilfs_btnode_commit_change_key() will be called.
|
|
|
|
* To protect the page in intermediate state, the page lock
|
|
|
|
* is held.
|
|
|
|
*/
|
|
|
|
radix_tree_preload_end();
|
|
|
|
if (!err)
|
|
|
|
return 0;
|
|
|
|
else if (err != -EEXIST)
|
|
|
|
goto failed_unlock;
|
|
|
|
|
|
|
|
err = invalidate_inode_pages2_range(btnc, newkey, newkey);
|
|
|
|
if (!err)
|
|
|
|
goto retry;
|
|
|
|
/* fallback to copy mode */
|
|
|
|
unlock_page(obh->b_page);
|
|
|
|
}
|
|
|
|
|
2009-11-13 10:25:19 +03:00
|
|
|
nbh = nilfs_btnode_create_block(btnc, newkey);
|
|
|
|
if (!nbh)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
BUG_ON(nbh == obh);
|
|
|
|
ctxt->newbh = nbh;
|
|
|
|
return 0;
|
2009-04-07 06:01:25 +04:00
|
|
|
|
|
|
|
failed_unlock:
|
|
|
|
unlock_page(obh->b_page);
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* nilfs_btnode_commit_change_key
|
|
|
|
* commit the change_key operation prepared by prepare_change_key().
|
|
|
|
*/
|
|
|
|
void nilfs_btnode_commit_change_key(struct address_space *btnc,
|
|
|
|
struct nilfs_btnode_chkey_ctxt *ctxt)
|
|
|
|
{
|
|
|
|
struct buffer_head *obh = ctxt->bh, *nbh = ctxt->newbh;
|
|
|
|
__u64 oldkey = ctxt->oldkey, newkey = ctxt->newkey;
|
|
|
|
struct page *opage;
|
|
|
|
|
|
|
|
if (oldkey == newkey)
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (nbh == NULL) { /* blocksize == pagesize */
|
|
|
|
opage = obh->b_page;
|
|
|
|
if (unlikely(oldkey != opage->index))
|
|
|
|
NILFS_PAGE_BUG(opage,
|
|
|
|
"invalid oldkey %lld (newkey=%lld)",
|
|
|
|
(unsigned long long)oldkey,
|
|
|
|
(unsigned long long)newkey);
|
2011-05-05 07:56:51 +04:00
|
|
|
mark_buffer_dirty(obh);
|
2009-04-07 06:01:25 +04:00
|
|
|
|
|
|
|
spin_lock_irq(&btnc->tree_lock);
|
|
|
|
radix_tree_delete(&btnc->page_tree, oldkey);
|
|
|
|
radix_tree_tag_set(&btnc->page_tree, newkey,
|
|
|
|
PAGECACHE_TAG_DIRTY);
|
|
|
|
spin_unlock_irq(&btnc->tree_lock);
|
|
|
|
|
|
|
|
opage->index = obh->b_blocknr = newkey;
|
|
|
|
unlock_page(opage);
|
|
|
|
} else {
|
|
|
|
nilfs_copy_buffer(nbh, obh);
|
2011-05-05 07:56:51 +04:00
|
|
|
mark_buffer_dirty(nbh);
|
2009-04-07 06:01:25 +04:00
|
|
|
|
|
|
|
nbh->b_blocknr = newkey;
|
|
|
|
ctxt->bh = nbh;
|
|
|
|
nilfs_btnode_delete(obh); /* will decrement bh->b_count */
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* nilfs_btnode_abort_change_key
|
|
|
|
* abort the change_key operation prepared by prepare_change_key().
|
|
|
|
*/
|
|
|
|
void nilfs_btnode_abort_change_key(struct address_space *btnc,
|
|
|
|
struct nilfs_btnode_chkey_ctxt *ctxt)
|
|
|
|
{
|
|
|
|
struct buffer_head *nbh = ctxt->newbh;
|
|
|
|
__u64 oldkey = ctxt->oldkey, newkey = ctxt->newkey;
|
|
|
|
|
|
|
|
if (oldkey == newkey)
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (nbh == NULL) { /* blocksize == pagesize */
|
|
|
|
spin_lock_irq(&btnc->tree_lock);
|
|
|
|
radix_tree_delete(&btnc->page_tree, newkey);
|
|
|
|
spin_unlock_irq(&btnc->tree_lock);
|
|
|
|
unlock_page(ctxt->bh->b_page);
|
|
|
|
} else
|
|
|
|
brelse(nbh);
|
|
|
|
}
|