2009-04-07 10:01:28 +08:00
|
|
|
/*
|
|
|
|
* mdt.c - meta data file for NILFS
|
|
|
|
*
|
|
|
|
* 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.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
* along with this program; if not, write to the Free Software
|
|
|
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|
|
|
*
|
|
|
|
* Written by Ryusuke Konishi <ryusuke@osrg.net>
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/buffer_head.h>
|
|
|
|
#include <linux/mpage.h>
|
|
|
|
#include <linux/mm.h>
|
|
|
|
#include <linux/writeback.h>
|
|
|
|
#include <linux/backing-dev.h>
|
|
|
|
#include <linux/swap.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 16:04:11 +08:00
|
|
|
#include <linux/slab.h>
|
2009-04-07 10:01:28 +08:00
|
|
|
#include "nilfs.h"
|
2010-07-10 19:52:09 +08:00
|
|
|
#include "btnode.h"
|
2009-04-07 10:01:28 +08:00
|
|
|
#include "segment.h"
|
|
|
|
#include "page.h"
|
|
|
|
#include "mdt.h"
|
|
|
|
|
2015-11-07 08:32:08 +08:00
|
|
|
#include <trace/events/nilfs2.h>
|
2009-04-07 10:01:28 +08:00
|
|
|
|
|
|
|
#define NILFS_MDT_MAX_RA_BLOCKS (16 - 1)
|
|
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
nilfs_mdt_insert_new_block(struct inode *inode, unsigned long block,
|
|
|
|
struct buffer_head *bh,
|
|
|
|
void (*init_block)(struct inode *,
|
|
|
|
struct buffer_head *, void *))
|
|
|
|
{
|
|
|
|
struct nilfs_inode_info *ii = NILFS_I(inode);
|
|
|
|
void *kaddr;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
/* Caller exclude read accesses using page lock */
|
|
|
|
|
|
|
|
/* set_buffer_new(bh); */
|
|
|
|
bh->b_blocknr = 0;
|
|
|
|
|
|
|
|
ret = nilfs_bmap_insert(ii->i_bmap, block, (unsigned long)bh);
|
|
|
|
if (unlikely(ret))
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
set_buffer_mapped(bh);
|
|
|
|
|
2011-11-25 23:14:33 +08:00
|
|
|
kaddr = kmap_atomic(bh->b_page);
|
2009-04-07 10:01:28 +08:00
|
|
|
memset(kaddr + bh_offset(bh), 0, 1 << inode->i_blkbits);
|
|
|
|
if (init_block)
|
|
|
|
init_block(inode, bh, kaddr);
|
|
|
|
flush_dcache_page(bh->b_page);
|
2011-11-25 23:14:33 +08:00
|
|
|
kunmap_atomic(kaddr);
|
2009-04-07 10:01:28 +08:00
|
|
|
|
|
|
|
set_buffer_uptodate(bh);
|
2011-05-05 11:56:51 +08:00
|
|
|
mark_buffer_dirty(bh);
|
2009-04-07 10:01:28 +08:00
|
|
|
nilfs_mdt_mark_dirty(inode);
|
2015-11-07 08:32:08 +08:00
|
|
|
|
|
|
|
trace_nilfs2_mdt_insert_new_block(inode, inode->i_ino, block);
|
|
|
|
|
2009-04-07 10:01:28 +08:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int nilfs_mdt_create_block(struct inode *inode, unsigned long block,
|
|
|
|
struct buffer_head **out_bh,
|
|
|
|
void (*init_block)(struct inode *,
|
|
|
|
struct buffer_head *,
|
|
|
|
void *))
|
|
|
|
{
|
|
|
|
struct super_block *sb = inode->i_sb;
|
|
|
|
struct nilfs_transaction_info ti;
|
|
|
|
struct buffer_head *bh;
|
|
|
|
int err;
|
|
|
|
|
|
|
|
nilfs_transaction_begin(sb, &ti, 0);
|
|
|
|
|
|
|
|
err = -ENOMEM;
|
|
|
|
bh = nilfs_grab_buffer(inode, inode->i_mapping, block, 0);
|
|
|
|
if (unlikely(!bh))
|
|
|
|
goto failed_unlock;
|
|
|
|
|
|
|
|
err = -EEXIST;
|
2009-09-06 16:49:49 +08:00
|
|
|
if (buffer_uptodate(bh))
|
2009-04-07 10:01:28 +08:00
|
|
|
goto failed_bh;
|
2009-09-06 16:49:49 +08:00
|
|
|
|
2009-04-07 10:01:28 +08:00
|
|
|
wait_on_buffer(bh);
|
|
|
|
if (buffer_uptodate(bh))
|
|
|
|
goto failed_bh;
|
|
|
|
|
2010-09-05 15:17:35 +08:00
|
|
|
bh->b_bdev = sb->s_bdev;
|
2009-04-07 10:01:28 +08:00
|
|
|
err = nilfs_mdt_insert_new_block(inode, block, bh, init_block);
|
|
|
|
if (likely(!err)) {
|
|
|
|
get_bh(bh);
|
|
|
|
*out_bh = bh;
|
|
|
|
}
|
|
|
|
|
|
|
|
failed_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 20:29:47 +08:00
|
|
|
put_page(bh->b_page);
|
2009-04-07 10:01:28 +08:00
|
|
|
brelse(bh);
|
|
|
|
|
|
|
|
failed_unlock:
|
2009-04-07 10:01:45 +08:00
|
|
|
if (likely(!err))
|
|
|
|
err = nilfs_transaction_commit(sb);
|
|
|
|
else
|
|
|
|
nilfs_transaction_abort(sb);
|
2010-09-05 15:17:35 +08:00
|
|
|
|
2009-04-07 10:01:28 +08:00
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
nilfs_mdt_submit_block(struct inode *inode, unsigned long blkoff,
|
|
|
|
int mode, struct buffer_head **out_bh)
|
|
|
|
{
|
|
|
|
struct buffer_head *bh;
|
2009-08-15 01:29:28 +08:00
|
|
|
__u64 blknum = 0;
|
2009-04-07 10:01:28 +08:00
|
|
|
int ret = -ENOMEM;
|
|
|
|
|
|
|
|
bh = nilfs_grab_buffer(inode, inode->i_mapping, blkoff, 0);
|
|
|
|
if (unlikely(!bh))
|
|
|
|
goto failed;
|
|
|
|
|
|
|
|
ret = -EEXIST; /* internal code */
|
|
|
|
if (buffer_uptodate(bh))
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
if (mode == READA) {
|
|
|
|
if (!trylock_buffer(bh)) {
|
|
|
|
ret = -EBUSY;
|
|
|
|
goto failed_bh;
|
|
|
|
}
|
2009-04-07 10:01:55 +08:00
|
|
|
} else /* mode == READ */
|
2009-04-07 10:01:28 +08:00
|
|
|
lock_buffer(bh);
|
|
|
|
|
|
|
|
if (buffer_uptodate(bh)) {
|
|
|
|
unlock_buffer(bh);
|
|
|
|
goto out;
|
|
|
|
}
|
2009-09-06 16:49:49 +08:00
|
|
|
|
|
|
|
ret = nilfs_bmap_lookup(NILFS_I(inode)->i_bmap, blkoff, &blknum);
|
|
|
|
if (unlikely(ret)) {
|
|
|
|
unlock_buffer(bh);
|
|
|
|
goto failed_bh;
|
2009-04-07 10:01:28 +08:00
|
|
|
}
|
2010-09-04 23:23:50 +08:00
|
|
|
map_bh(bh, inode->i_sb, (sector_t)blknum);
|
2009-04-07 10:01:28 +08:00
|
|
|
|
|
|
|
bh->b_end_io = end_buffer_read_sync;
|
|
|
|
get_bh(bh);
|
|
|
|
submit_bh(mode, bh);
|
|
|
|
ret = 0;
|
2015-11-07 08:32:08 +08:00
|
|
|
|
|
|
|
trace_nilfs2_mdt_submit_block(inode, inode->i_ino, blkoff, mode);
|
2009-04-07 10:01:28 +08:00
|
|
|
out:
|
|
|
|
get_bh(bh);
|
|
|
|
*out_bh = bh;
|
|
|
|
|
|
|
|
failed_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 20:29:47 +08:00
|
|
|
put_page(bh->b_page);
|
2009-04-07 10:01:28 +08:00
|
|
|
brelse(bh);
|
|
|
|
failed:
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int nilfs_mdt_read_block(struct inode *inode, unsigned long block,
|
2009-11-13 23:09:47 +08:00
|
|
|
int readahead, struct buffer_head **out_bh)
|
2009-04-07 10:01:28 +08:00
|
|
|
{
|
|
|
|
struct buffer_head *first_bh, *bh;
|
|
|
|
unsigned long blkoff;
|
|
|
|
int i, nr_ra_blocks = NILFS_MDT_MAX_RA_BLOCKS;
|
|
|
|
int err;
|
|
|
|
|
|
|
|
err = nilfs_mdt_submit_block(inode, block, READ, &first_bh);
|
|
|
|
if (err == -EEXIST) /* internal code */
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
if (unlikely(err))
|
|
|
|
goto failed;
|
|
|
|
|
2009-11-13 23:09:47 +08:00
|
|
|
if (readahead) {
|
|
|
|
blkoff = block + 1;
|
|
|
|
for (i = 0; i < nr_ra_blocks; i++, blkoff++) {
|
|
|
|
err = nilfs_mdt_submit_block(inode, blkoff, READA, &bh);
|
|
|
|
if (likely(!err || err == -EEXIST))
|
|
|
|
brelse(bh);
|
|
|
|
else if (err != -EBUSY)
|
|
|
|
break;
|
|
|
|
/* abort readahead if bmap lookup failed */
|
|
|
|
if (!buffer_locked(first_bh))
|
|
|
|
goto out_no_wait;
|
|
|
|
}
|
2009-04-07 10:01:28 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
wait_on_buffer(first_bh);
|
|
|
|
|
|
|
|
out_no_wait:
|
|
|
|
err = -EIO;
|
|
|
|
if (!buffer_uptodate(first_bh))
|
|
|
|
goto failed_bh;
|
|
|
|
out:
|
|
|
|
*out_bh = first_bh;
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
failed_bh:
|
|
|
|
brelse(first_bh);
|
|
|
|
failed:
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* nilfs_mdt_get_block - read or create a buffer on meta data file.
|
|
|
|
* @inode: inode of the meta data file
|
|
|
|
* @blkoff: block offset
|
|
|
|
* @create: create flag
|
|
|
|
* @init_block: initializer used for newly allocated block
|
|
|
|
* @out_bh: output of a pointer to the buffer_head
|
|
|
|
*
|
|
|
|
* nilfs_mdt_get_block() looks up the specified buffer and tries to create
|
|
|
|
* a new buffer if @create is not zero. On success, the returned buffer is
|
|
|
|
* assured to be either existing or formatted using a buffer lock on success.
|
|
|
|
* @out_bh is substituted only when zero is returned.
|
|
|
|
*
|
|
|
|
* Return Value: On success, it returns 0. On error, the following negative
|
|
|
|
* error code is returned.
|
|
|
|
*
|
|
|
|
* %-ENOMEM - Insufficient memory available.
|
|
|
|
*
|
|
|
|
* %-EIO - I/O error
|
|
|
|
*
|
|
|
|
* %-ENOENT - the specified block does not exist (hole block)
|
|
|
|
*
|
|
|
|
* %-EROFS - Read only filesystem (for create mode)
|
|
|
|
*/
|
|
|
|
int nilfs_mdt_get_block(struct inode *inode, unsigned long blkoff, int create,
|
|
|
|
void (*init_block)(struct inode *,
|
|
|
|
struct buffer_head *, void *),
|
|
|
|
struct buffer_head **out_bh)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
/* Should be rewritten with merging nilfs_mdt_read_block() */
|
|
|
|
retry:
|
2009-11-13 23:09:47 +08:00
|
|
|
ret = nilfs_mdt_read_block(inode, blkoff, !create, out_bh);
|
2009-04-07 10:01:28 +08:00
|
|
|
if (!create || ret != -ENOENT)
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
ret = nilfs_mdt_create_block(inode, blkoff, out_bh, init_block);
|
|
|
|
if (unlikely(ret == -EEXIST)) {
|
|
|
|
/* create = 0; */ /* limit read-create loop retries */
|
|
|
|
goto retry;
|
|
|
|
}
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2015-04-17 03:46:39 +08:00
|
|
|
/**
|
|
|
|
* nilfs_mdt_find_block - find and get a buffer on meta data file.
|
|
|
|
* @inode: inode of the meta data file
|
|
|
|
* @start: start block offset (inclusive)
|
|
|
|
* @end: end block offset (inclusive)
|
|
|
|
* @blkoff: block offset
|
|
|
|
* @out_bh: place to store a pointer to buffer_head struct
|
|
|
|
*
|
|
|
|
* nilfs_mdt_find_block() looks up an existing block in range of
|
|
|
|
* [@start, @end] and stores pointer to a buffer head of the block to
|
|
|
|
* @out_bh, and block offset to @blkoff, respectively. @out_bh and
|
|
|
|
* @blkoff are substituted only when zero is returned.
|
|
|
|
*
|
|
|
|
* Return Value: On success, it returns 0. On error, the following negative
|
|
|
|
* error code is returned.
|
|
|
|
*
|
|
|
|
* %-ENOMEM - Insufficient memory available.
|
|
|
|
*
|
|
|
|
* %-EIO - I/O error
|
|
|
|
*
|
|
|
|
* %-ENOENT - no block was found in the range
|
|
|
|
*/
|
|
|
|
int nilfs_mdt_find_block(struct inode *inode, unsigned long start,
|
|
|
|
unsigned long end, unsigned long *blkoff,
|
|
|
|
struct buffer_head **out_bh)
|
|
|
|
{
|
|
|
|
__u64 next;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
if (unlikely(start > end))
|
|
|
|
return -ENOENT;
|
|
|
|
|
|
|
|
ret = nilfs_mdt_read_block(inode, start, true, out_bh);
|
|
|
|
if (!ret) {
|
|
|
|
*blkoff = start;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
if (unlikely(ret != -ENOENT || start == ULONG_MAX))
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
ret = nilfs_bmap_seek_key(NILFS_I(inode)->i_bmap, start + 1, &next);
|
|
|
|
if (!ret) {
|
|
|
|
if (next <= end) {
|
|
|
|
ret = nilfs_mdt_read_block(inode, next, true, out_bh);
|
|
|
|
if (!ret)
|
|
|
|
*blkoff = next;
|
|
|
|
} else {
|
|
|
|
ret = -ENOENT;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
out:
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2009-04-07 10:01:28 +08:00
|
|
|
/**
|
|
|
|
* nilfs_mdt_delete_block - make a hole on the meta data file.
|
|
|
|
* @inode: inode of the meta data file
|
|
|
|
* @block: block offset
|
|
|
|
*
|
|
|
|
* Return Value: On success, zero is returned.
|
|
|
|
* On error, one of the following negative error code is returned.
|
|
|
|
*
|
|
|
|
* %-ENOMEM - Insufficient memory available.
|
|
|
|
*
|
|
|
|
* %-EIO - I/O error
|
|
|
|
*/
|
|
|
|
int nilfs_mdt_delete_block(struct inode *inode, unsigned long block)
|
|
|
|
{
|
|
|
|
struct nilfs_inode_info *ii = NILFS_I(inode);
|
|
|
|
int err;
|
|
|
|
|
|
|
|
err = nilfs_bmap_delete(ii->i_bmap, block);
|
2009-05-05 20:52:06 +08:00
|
|
|
if (!err || err == -ENOENT) {
|
2009-04-07 10:01:28 +08:00
|
|
|
nilfs_mdt_mark_dirty(inode);
|
|
|
|
nilfs_mdt_forget_block(inode, block);
|
|
|
|
}
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* nilfs_mdt_forget_block - discard dirty state and try to remove the page
|
|
|
|
* @inode: inode of the meta data file
|
|
|
|
* @block: block offset
|
|
|
|
*
|
|
|
|
* nilfs_mdt_forget_block() clears a dirty flag of the specified buffer, and
|
|
|
|
* tries to release the page including the buffer from a page cache.
|
|
|
|
*
|
|
|
|
* Return Value: On success, 0 is returned. On error, one of the following
|
|
|
|
* negative error code is returned.
|
|
|
|
*
|
|
|
|
* %-EBUSY - page has an active buffer.
|
|
|
|
*
|
|
|
|
* %-ENOENT - page cache has no page addressed by the offset.
|
|
|
|
*/
|
|
|
|
int nilfs_mdt_forget_block(struct inode *inode, unsigned long block)
|
|
|
|
{
|
|
|
|
pgoff_t index = (pgoff_t)block >>
|
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 20:29:47 +08:00
|
|
|
(PAGE_SHIFT - inode->i_blkbits);
|
2009-04-07 10:01:28 +08:00
|
|
|
struct page *page;
|
|
|
|
unsigned long first_block;
|
|
|
|
int ret = 0;
|
|
|
|
int still_dirty;
|
|
|
|
|
|
|
|
page = find_lock_page(inode->i_mapping, index);
|
|
|
|
if (!page)
|
|
|
|
return -ENOENT;
|
|
|
|
|
|
|
|
wait_on_page_writeback(page);
|
|
|
|
|
|
|
|
first_block = (unsigned long)index <<
|
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 20:29:47 +08:00
|
|
|
(PAGE_SHIFT - inode->i_blkbits);
|
2009-04-07 10:01:28 +08:00
|
|
|
if (page_has_buffers(page)) {
|
|
|
|
struct buffer_head *bh;
|
|
|
|
|
|
|
|
bh = nilfs_page_get_nth_block(page, block - first_block);
|
|
|
|
nilfs_forget_buffer(bh);
|
|
|
|
}
|
|
|
|
still_dirty = PageDirty(page);
|
|
|
|
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 20:29:47 +08:00
|
|
|
put_page(page);
|
2009-04-07 10:01:28 +08:00
|
|
|
|
|
|
|
if (still_dirty ||
|
|
|
|
invalidate_inode_pages2_range(inode->i_mapping, index, index) != 0)
|
|
|
|
ret = -EBUSY;
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* nilfs_mdt_mark_block_dirty - mark a block on the meta data file dirty.
|
|
|
|
* @inode: inode of the meta data file
|
|
|
|
* @block: block offset
|
|
|
|
*
|
|
|
|
* Return Value: On success, it returns 0. On error, the following negative
|
|
|
|
* error code is returned.
|
|
|
|
*
|
|
|
|
* %-ENOMEM - Insufficient memory available.
|
|
|
|
*
|
|
|
|
* %-EIO - I/O error
|
|
|
|
*
|
|
|
|
* %-ENOENT - the specified block does not exist (hole block)
|
|
|
|
*/
|
|
|
|
int nilfs_mdt_mark_block_dirty(struct inode *inode, unsigned long block)
|
|
|
|
{
|
|
|
|
struct buffer_head *bh;
|
|
|
|
int err;
|
|
|
|
|
2009-11-13 23:09:47 +08:00
|
|
|
err = nilfs_mdt_read_block(inode, block, 0, &bh);
|
2009-04-07 10:01:28 +08:00
|
|
|
if (unlikely(err))
|
|
|
|
return err;
|
2011-05-05 11:56:51 +08:00
|
|
|
mark_buffer_dirty(bh);
|
2009-04-07 10:01:28 +08:00
|
|
|
nilfs_mdt_mark_dirty(inode);
|
|
|
|
brelse(bh);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int nilfs_mdt_fetch_dirty(struct inode *inode)
|
|
|
|
{
|
|
|
|
struct nilfs_inode_info *ii = NILFS_I(inode);
|
|
|
|
|
|
|
|
if (nilfs_bmap_test_and_clear_dirty(ii->i_bmap)) {
|
|
|
|
set_bit(NILFS_I_DIRTY, &ii->i_state);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
return test_bit(NILFS_I_DIRTY, &ii->i_state);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
nilfs_mdt_write_page(struct page *page, struct writeback_control *wbc)
|
|
|
|
{
|
2013-05-01 06:27:48 +08:00
|
|
|
struct inode *inode = page->mapping->host;
|
2010-09-06 11:05:43 +08:00
|
|
|
struct super_block *sb;
|
2009-04-07 10:01:28 +08:00
|
|
|
int err = 0;
|
|
|
|
|
2013-05-01 06:27:48 +08:00
|
|
|
if (inode && (inode->i_sb->s_flags & MS_RDONLY)) {
|
|
|
|
/*
|
|
|
|
* It means that filesystem was remounted in read-only
|
|
|
|
* mode because of error or metadata corruption. But we
|
|
|
|
* have dirty pages that try to be flushed in background.
|
|
|
|
* So, here we simply discard this dirty page.
|
|
|
|
*/
|
|
|
|
nilfs_clear_dirty_page(page, false);
|
|
|
|
unlock_page(page);
|
|
|
|
return -EROFS;
|
|
|
|
}
|
|
|
|
|
2009-04-07 10:01:28 +08:00
|
|
|
redirty_page_for_writepage(wbc, page);
|
|
|
|
unlock_page(page);
|
|
|
|
|
2010-09-06 11:05:43 +08:00
|
|
|
if (!inode)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
sb = inode->i_sb;
|
2009-04-07 10:01:28 +08:00
|
|
|
|
|
|
|
if (wbc->sync_mode == WB_SYNC_ALL)
|
|
|
|
err = nilfs_construct_segment(sb);
|
|
|
|
else if (wbc->for_reclaim)
|
|
|
|
nilfs_flush_segment(sb, inode->i_ino);
|
|
|
|
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-09-22 08:01:10 +08:00
|
|
|
static const struct address_space_operations def_mdt_aops = {
|
2009-04-07 10:01:28 +08:00
|
|
|
.writepage = nilfs_mdt_write_page,
|
|
|
|
};
|
|
|
|
|
2009-09-22 08:01:11 +08:00
|
|
|
static const struct inode_operations def_mdt_iops;
|
2009-10-02 06:43:56 +08:00
|
|
|
static const struct file_operations def_mdt_fops;
|
2009-04-07 10:01:28 +08:00
|
|
|
|
2010-08-21 21:01:51 +08:00
|
|
|
|
2010-09-05 11:20:59 +08:00
|
|
|
int nilfs_mdt_init(struct inode *inode, gfp_t gfp_mask, size_t objsz)
|
2010-08-21 21:01:51 +08:00
|
|
|
{
|
|
|
|
struct nilfs_mdt_info *mi;
|
|
|
|
|
|
|
|
mi = kzalloc(max(sizeof(*mi), objsz), GFP_NOFS);
|
|
|
|
if (!mi)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
init_rwsem(&mi->mi_sem);
|
|
|
|
inode->i_private = mi;
|
|
|
|
|
|
|
|
inode->i_mode = S_IFREG;
|
|
|
|
mapping_set_gfp_mask(inode->i_mapping, gfp_mask);
|
2010-09-05 11:20:59 +08:00
|
|
|
|
|
|
|
inode->i_op = &def_mdt_iops;
|
|
|
|
inode->i_fop = &def_mdt_fops;
|
|
|
|
inode->i_mapping->a_ops = &def_mdt_aops;
|
2010-08-21 21:01:51 +08:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2009-04-07 10:01:28 +08:00
|
|
|
void nilfs_mdt_set_entry_size(struct inode *inode, unsigned entry_size,
|
|
|
|
unsigned header_size)
|
|
|
|
{
|
|
|
|
struct nilfs_mdt_info *mi = NILFS_MDT(inode);
|
|
|
|
|
|
|
|
mi->mi_entry_size = entry_size;
|
|
|
|
mi->mi_entries_per_block = (1 << inode->i_blkbits) / entry_size;
|
|
|
|
mi->mi_first_entry_offset = DIV_ROUND_UP(header_size, entry_size);
|
|
|
|
}
|
|
|
|
|
2010-09-06 11:05:43 +08:00
|
|
|
/**
|
|
|
|
* nilfs_mdt_setup_shadow_map - setup shadow map and bind it to metadata file
|
|
|
|
* @inode: inode of the metadata file
|
|
|
|
* @shadow: shadow mapping
|
|
|
|
*/
|
|
|
|
int nilfs_mdt_setup_shadow_map(struct inode *inode,
|
|
|
|
struct nilfs_shadow_map *shadow)
|
|
|
|
{
|
|
|
|
struct nilfs_mdt_info *mi = NILFS_MDT(inode);
|
|
|
|
|
|
|
|
INIT_LIST_HEAD(&shadow->frozen_buffers);
|
2011-02-23 20:49:47 +08:00
|
|
|
address_space_init_once(&shadow->frozen_data);
|
2015-01-14 17:42:37 +08:00
|
|
|
nilfs_mapping_init(&shadow->frozen_data, inode);
|
2011-02-23 20:49:47 +08:00
|
|
|
address_space_init_once(&shadow->frozen_btnodes);
|
2015-01-14 17:42:37 +08:00
|
|
|
nilfs_mapping_init(&shadow->frozen_btnodes, inode);
|
2010-09-06 11:05:43 +08:00
|
|
|
mi->mi_shadow = shadow;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* nilfs_mdt_save_to_shadow_map - copy bmap and dirty pages to shadow map
|
|
|
|
* @inode: inode of the metadata file
|
|
|
|
*/
|
|
|
|
int nilfs_mdt_save_to_shadow_map(struct inode *inode)
|
|
|
|
{
|
|
|
|
struct nilfs_mdt_info *mi = NILFS_MDT(inode);
|
|
|
|
struct nilfs_inode_info *ii = NILFS_I(inode);
|
|
|
|
struct nilfs_shadow_map *shadow = mi->mi_shadow;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
ret = nilfs_copy_dirty_pages(&shadow->frozen_data, inode->i_mapping);
|
|
|
|
if (ret)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
ret = nilfs_copy_dirty_pages(&shadow->frozen_btnodes,
|
|
|
|
&ii->i_btnode_cache);
|
|
|
|
if (ret)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
nilfs_bmap_save(ii->i_bmap, &shadow->bmap_store);
|
|
|
|
out:
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2010-08-31 10:40:34 +08:00
|
|
|
int nilfs_mdt_freeze_buffer(struct inode *inode, struct buffer_head *bh)
|
|
|
|
{
|
|
|
|
struct nilfs_shadow_map *shadow = NILFS_MDT(inode)->mi_shadow;
|
|
|
|
struct buffer_head *bh_frozen;
|
|
|
|
struct page *page;
|
|
|
|
int blkbits = inode->i_blkbits;
|
|
|
|
|
|
|
|
page = grab_cache_page(&shadow->frozen_data, bh->b_page->index);
|
|
|
|
if (!page)
|
2010-12-26 23:03:02 +08:00
|
|
|
return -ENOMEM;
|
2010-08-31 10:40:34 +08:00
|
|
|
|
|
|
|
if (!page_has_buffers(page))
|
|
|
|
create_empty_buffers(page, 1 << blkbits, 0);
|
|
|
|
|
|
|
|
bh_frozen = nilfs_page_get_nth_block(page, bh_offset(bh) >> blkbits);
|
2010-12-26 23:03:02 +08:00
|
|
|
|
|
|
|
if (!buffer_uptodate(bh_frozen))
|
|
|
|
nilfs_copy_buffer(bh_frozen, bh);
|
|
|
|
if (list_empty(&bh_frozen->b_assoc_buffers)) {
|
|
|
|
list_add_tail(&bh_frozen->b_assoc_buffers,
|
|
|
|
&shadow->frozen_buffers);
|
|
|
|
set_buffer_nilfs_redirected(bh);
|
|
|
|
} else {
|
|
|
|
brelse(bh_frozen); /* already frozen */
|
2010-08-31 10:40:34 +08:00
|
|
|
}
|
2010-12-26 23:03:02 +08:00
|
|
|
|
2010-08-31 10:40:34 +08: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 20:29:47 +08:00
|
|
|
put_page(page);
|
2010-12-26 23:03:02 +08:00
|
|
|
return 0;
|
2010-08-31 10:40:34 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
struct buffer_head *
|
|
|
|
nilfs_mdt_get_frozen_buffer(struct inode *inode, struct buffer_head *bh)
|
|
|
|
{
|
|
|
|
struct nilfs_shadow_map *shadow = NILFS_MDT(inode)->mi_shadow;
|
|
|
|
struct buffer_head *bh_frozen = NULL;
|
|
|
|
struct page *page;
|
|
|
|
int n;
|
|
|
|
|
|
|
|
page = find_lock_page(&shadow->frozen_data, bh->b_page->index);
|
|
|
|
if (page) {
|
|
|
|
if (page_has_buffers(page)) {
|
|
|
|
n = bh_offset(bh) >> inode->i_blkbits;
|
|
|
|
bh_frozen = nilfs_page_get_nth_block(page, n);
|
|
|
|
}
|
|
|
|
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 20:29:47 +08:00
|
|
|
put_page(page);
|
2010-08-31 10:40:34 +08:00
|
|
|
}
|
|
|
|
return bh_frozen;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void nilfs_release_frozen_buffers(struct nilfs_shadow_map *shadow)
|
|
|
|
{
|
|
|
|
struct list_head *head = &shadow->frozen_buffers;
|
|
|
|
struct buffer_head *bh;
|
|
|
|
|
|
|
|
while (!list_empty(head)) {
|
|
|
|
bh = list_first_entry(head, struct buffer_head,
|
|
|
|
b_assoc_buffers);
|
|
|
|
list_del_init(&bh->b_assoc_buffers);
|
|
|
|
brelse(bh); /* drop ref-count to make it releasable */
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-09-06 11:05:43 +08:00
|
|
|
/**
|
|
|
|
* nilfs_mdt_restore_from_shadow_map - restore dirty pages and bmap state
|
|
|
|
* @inode: inode of the metadata file
|
|
|
|
*/
|
|
|
|
void nilfs_mdt_restore_from_shadow_map(struct inode *inode)
|
|
|
|
{
|
|
|
|
struct nilfs_mdt_info *mi = NILFS_MDT(inode);
|
|
|
|
struct nilfs_inode_info *ii = NILFS_I(inode);
|
|
|
|
struct nilfs_shadow_map *shadow = mi->mi_shadow;
|
|
|
|
|
|
|
|
down_write(&mi->mi_sem);
|
|
|
|
|
|
|
|
if (mi->mi_palloc_cache)
|
|
|
|
nilfs_palloc_clear_cache(inode);
|
|
|
|
|
2013-05-01 06:27:48 +08:00
|
|
|
nilfs_clear_dirty_pages(inode->i_mapping, true);
|
2010-09-06 11:05:43 +08:00
|
|
|
nilfs_copy_back_pages(inode->i_mapping, &shadow->frozen_data);
|
|
|
|
|
2013-05-01 06:27:48 +08:00
|
|
|
nilfs_clear_dirty_pages(&ii->i_btnode_cache, true);
|
2010-09-06 11:05:43 +08:00
|
|
|
nilfs_copy_back_pages(&ii->i_btnode_cache, &shadow->frozen_btnodes);
|
|
|
|
|
|
|
|
nilfs_bmap_restore(ii->i_bmap, &shadow->bmap_store);
|
|
|
|
|
|
|
|
up_write(&mi->mi_sem);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* nilfs_mdt_clear_shadow_map - truncate pages in shadow map caches
|
|
|
|
* @inode: inode of the metadata file
|
|
|
|
*/
|
|
|
|
void nilfs_mdt_clear_shadow_map(struct inode *inode)
|
|
|
|
{
|
|
|
|
struct nilfs_mdt_info *mi = NILFS_MDT(inode);
|
|
|
|
struct nilfs_shadow_map *shadow = mi->mi_shadow;
|
|
|
|
|
|
|
|
down_write(&mi->mi_sem);
|
2010-08-31 10:40:34 +08:00
|
|
|
nilfs_release_frozen_buffers(shadow);
|
2010-09-06 11:05:43 +08:00
|
|
|
truncate_inode_pages(&shadow->frozen_data, 0);
|
|
|
|
truncate_inode_pages(&shadow->frozen_btnodes, 0);
|
|
|
|
up_write(&mi->mi_sem);
|
|
|
|
}
|