2006-10-11 10:20:50 +02:00
|
|
|
/*
|
2006-10-11 10:20:53 +02:00
|
|
|
* linux/fs/ext4/inode.c
|
2006-10-11 10:20:50 +02:00
|
|
|
*
|
|
|
|
* Copyright (C) 1992, 1993, 1994, 1995
|
|
|
|
* Remy Card (card@masi.ibp.fr)
|
|
|
|
* Laboratoire MASI - Institut Blaise Pascal
|
|
|
|
* Universite Pierre et Marie Curie (Paris VI)
|
|
|
|
*
|
|
|
|
* from
|
|
|
|
*
|
|
|
|
* linux/fs/minix/inode.c
|
|
|
|
*
|
|
|
|
* Copyright (C) 1991, 1992 Linus Torvalds
|
|
|
|
*
|
|
|
|
* 64-bit file support on 64-bit platforms by Jakub Jelinek
|
|
|
|
* (jj@sunsite.ms.mff.cuni.cz)
|
|
|
|
*
|
2006-10-11 10:20:53 +02:00
|
|
|
* Assorted race fixes, rewrite of ext4_get_block() by Al Viro, 2000
|
2006-10-11 10:20:50 +02:00
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/module.h>
|
|
|
|
#include <linux/fs.h>
|
|
|
|
#include <linux/time.h>
|
2006-10-11 10:21:01 +02:00
|
|
|
#include <linux/jbd2.h>
|
2006-10-11 10:20:50 +02:00
|
|
|
#include <linux/highuid.h>
|
|
|
|
#include <linux/pagemap.h>
|
|
|
|
#include <linux/quotaops.h>
|
|
|
|
#include <linux/string.h>
|
|
|
|
#include <linux/buffer_head.h>
|
|
|
|
#include <linux/writeback.h>
|
2008-07-12 01:27:31 +02:00
|
|
|
#include <linux/pagevec.h>
|
2006-10-11 10:20:50 +02:00
|
|
|
#include <linux/mpage.h>
|
2008-12-19 21:47:15 +01:00
|
|
|
#include <linux/namei.h>
|
2006-10-11 10:20:50 +02:00
|
|
|
#include <linux/uio.h>
|
|
|
|
#include <linux/bio.h>
|
2009-09-28 21:48:41 +02:00
|
|
|
#include <linux/workqueue.h>
|
2010-03-04 22:14:02 +01:00
|
|
|
#include <linux/kernel.h>
|
2011-01-13 01:59:13 +01:00
|
|
|
#include <linux/printk.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 09:04:11 +01:00
|
|
|
#include <linux/slab.h>
|
2010-12-17 16:40:47 +01:00
|
|
|
#include <linux/ratelimit.h>
|
2009-06-17 17:48:11 +02:00
|
|
|
|
2008-04-30 00:13:32 +02:00
|
|
|
#include "ext4_jbd2.h"
|
2006-10-11 10:20:50 +02:00
|
|
|
#include "xattr.h"
|
|
|
|
#include "acl.h"
|
2011-06-28 01:16:04 +02:00
|
|
|
#include "truncate.h"
|
2006-10-11 10:20:50 +02:00
|
|
|
|
2009-06-17 17:48:11 +02:00
|
|
|
#include <trace/events/ext4.h>
|
|
|
|
|
2008-08-20 03:55:02 +02:00
|
|
|
#define MPAGE_DA_EXTENT_TAIL 0x01
|
|
|
|
|
2008-07-12 01:27:31 +02:00
|
|
|
static inline int ext4_begin_ordered_truncate(struct inode *inode,
|
|
|
|
loff_t new_size)
|
|
|
|
{
|
2010-11-08 19:51:33 +01:00
|
|
|
trace_ext4_begin_ordered_truncate(inode, new_size);
|
2011-01-10 18:29:43 +01:00
|
|
|
/*
|
|
|
|
* If jinode is zero, then we never opened the file for
|
|
|
|
* writing, so there's no need to call
|
|
|
|
* jbd2_journal_begin_ordered_truncate() since there's no
|
|
|
|
* outstanding writes we need to flush.
|
|
|
|
*/
|
|
|
|
if (!EXT4_I(inode)->jinode)
|
|
|
|
return 0;
|
|
|
|
return jbd2_journal_begin_ordered_truncate(EXT4_JOURNAL(inode),
|
|
|
|
EXT4_I(inode)->jinode,
|
|
|
|
new_size);
|
2008-07-12 01:27:31 +02:00
|
|
|
}
|
|
|
|
|
2008-07-12 01:27:31 +02:00
|
|
|
static void ext4_invalidatepage(struct page *page, unsigned long offset);
|
2010-10-28 03:30:09 +02:00
|
|
|
static int noalloc_get_block_write(struct inode *inode, sector_t iblock,
|
|
|
|
struct buffer_head *bh_result, int create);
|
|
|
|
static int ext4_set_bh_endio(struct buffer_head *bh, struct inode *inode);
|
|
|
|
static void ext4_end_io_buffer_write(struct buffer_head *bh, int uptodate);
|
|
|
|
static int __ext4_journalled_writepage(struct page *page, unsigned int len);
|
|
|
|
static int ext4_bh_delay_or_unwritten(handle_t *handle, struct buffer_head *bh);
|
2008-07-12 01:27:31 +02:00
|
|
|
|
2006-10-11 10:20:50 +02:00
|
|
|
/*
|
|
|
|
* Test whether an inode is a fast symlink.
|
|
|
|
*/
|
2006-10-11 10:20:53 +02:00
|
|
|
static int ext4_inode_is_fast_symlink(struct inode *inode)
|
2006-10-11 10:20:50 +02:00
|
|
|
{
|
2006-10-11 10:20:53 +02:00
|
|
|
int ea_blocks = EXT4_I(inode)->i_file_acl ?
|
2006-10-11 10:20:50 +02:00
|
|
|
(inode->i_sb->s_blocksize >> 9) : 0;
|
|
|
|
|
|
|
|
return (S_ISLNK(inode->i_mode) && inode->i_blocks - ea_blocks == 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Restart the transaction associated with *handle. This does a commit,
|
|
|
|
* so before we call here everything must be consistently dirtied against
|
|
|
|
* this transaction.
|
|
|
|
*/
|
2009-11-03 00:50:49 +01:00
|
|
|
int ext4_truncate_restart_trans(handle_t *handle, struct inode *inode,
|
2009-08-18 04:17:20 +02:00
|
|
|
int nblocks)
|
2006-10-11 10:20:50 +02:00
|
|
|
{
|
2009-08-18 04:17:20 +02:00
|
|
|
int ret;
|
|
|
|
|
|
|
|
/*
|
2010-05-17 01:00:00 +02:00
|
|
|
* Drop i_data_sem to avoid deadlock with ext4_map_blocks. At this
|
2009-08-18 04:17:20 +02:00
|
|
|
* moment, get_block can be called only for blocks inside i_size since
|
|
|
|
* page cache has been already dropped and writes are blocked by
|
|
|
|
* i_mutex. So we can safely drop the i_data_sem here.
|
|
|
|
*/
|
2009-01-07 06:06:22 +01:00
|
|
|
BUG_ON(EXT4_JOURNAL(inode) == NULL);
|
2006-10-11 10:20:50 +02:00
|
|
|
jbd_debug(2, "restarting handle %p\n", handle);
|
2009-08-18 04:17:20 +02:00
|
|
|
up_write(&EXT4_I(inode)->i_data_sem);
|
2011-02-28 05:32:12 +01:00
|
|
|
ret = ext4_journal_restart(handle, nblocks);
|
2009-08-18 04:17:20 +02:00
|
|
|
down_write(&EXT4_I(inode)->i_data_sem);
|
2009-11-03 00:50:49 +01:00
|
|
|
ext4_discard_preallocations(inode);
|
2009-08-18 04:17:20 +02:00
|
|
|
|
|
|
|
return ret;
|
2006-10-11 10:20:50 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Called at the last iput() if i_nlink is zero.
|
|
|
|
*/
|
2010-06-07 19:16:22 +02:00
|
|
|
void ext4_evict_inode(struct inode *inode)
|
2006-10-11 10:20:50 +02:00
|
|
|
{
|
|
|
|
handle_t *handle;
|
2008-08-03 03:10:38 +02:00
|
|
|
int err;
|
2006-10-11 10:20:50 +02:00
|
|
|
|
2010-11-08 19:51:33 +01:00
|
|
|
trace_ext4_evict_inode(inode);
|
2011-08-13 18:17:13 +02:00
|
|
|
|
|
|
|
ext4_ioend_wait(inode);
|
|
|
|
|
2010-06-07 19:16:22 +02:00
|
|
|
if (inode->i_nlink) {
|
2011-07-26 15:07:11 +02:00
|
|
|
/*
|
|
|
|
* When journalling data dirty buffers are tracked only in the
|
|
|
|
* journal. So although mm thinks everything is clean and
|
|
|
|
* ready for reaping the inode might still have some pages to
|
|
|
|
* write in the running transaction or waiting to be
|
|
|
|
* checkpointed. Thus calling jbd2_journal_invalidatepage()
|
|
|
|
* (via truncate_inode_pages()) to discard these buffers can
|
|
|
|
* cause data loss. Also even if we did not discard these
|
|
|
|
* buffers, we would have no way to find them after the inode
|
|
|
|
* is reaped and thus user could see stale data if he tries to
|
|
|
|
* read them before the transaction is checkpointed. So be
|
|
|
|
* careful and force everything to disk here... We use
|
|
|
|
* ei->i_datasync_tid to store the newest transaction
|
|
|
|
* containing inode's data.
|
|
|
|
*
|
|
|
|
* Note that directories do not have this problem because they
|
|
|
|
* don't use page cache.
|
|
|
|
*/
|
|
|
|
if (ext4_should_journal_data(inode) &&
|
|
|
|
(S_ISLNK(inode->i_mode) || S_ISREG(inode->i_mode))) {
|
|
|
|
journal_t *journal = EXT4_SB(inode->i_sb)->s_journal;
|
|
|
|
tid_t commit_tid = EXT4_I(inode)->i_datasync_tid;
|
|
|
|
|
|
|
|
jbd2_log_start_commit(journal, commit_tid);
|
|
|
|
jbd2_log_wait_commit(journal, commit_tid);
|
|
|
|
filemap_write_and_wait(&inode->i_data);
|
|
|
|
}
|
2010-06-07 19:16:22 +02:00
|
|
|
truncate_inode_pages(&inode->i_data, 0);
|
|
|
|
goto no_delete;
|
|
|
|
}
|
|
|
|
|
2010-03-03 15:05:06 +01:00
|
|
|
if (!is_bad_inode(inode))
|
2010-03-03 15:05:07 +01:00
|
|
|
dquot_initialize(inode);
|
2010-03-03 15:05:06 +01:00
|
|
|
|
2008-07-12 01:27:31 +02:00
|
|
|
if (ext4_should_order_data(inode))
|
|
|
|
ext4_begin_ordered_truncate(inode, 0);
|
2006-10-11 10:20:50 +02:00
|
|
|
truncate_inode_pages(&inode->i_data, 0);
|
|
|
|
|
|
|
|
if (is_bad_inode(inode))
|
|
|
|
goto no_delete;
|
|
|
|
|
2011-06-28 01:16:04 +02:00
|
|
|
handle = ext4_journal_start(inode, ext4_blocks_for_truncate(inode)+3);
|
2006-10-11 10:20:50 +02:00
|
|
|
if (IS_ERR(handle)) {
|
2008-08-03 03:10:38 +02:00
|
|
|
ext4_std_error(inode->i_sb, PTR_ERR(handle));
|
2006-10-11 10:20:50 +02:00
|
|
|
/*
|
|
|
|
* If we're going to skip the normal cleanup, we still need to
|
|
|
|
* make sure that the in-core orphan linked list is properly
|
|
|
|
* cleaned up.
|
|
|
|
*/
|
2006-10-11 10:20:53 +02:00
|
|
|
ext4_orphan_del(NULL, inode);
|
2006-10-11 10:20:50 +02:00
|
|
|
goto no_delete;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (IS_SYNC(inode))
|
2009-01-07 06:06:22 +01:00
|
|
|
ext4_handle_sync(handle);
|
2006-10-11 10:20:50 +02:00
|
|
|
inode->i_size = 0;
|
2008-08-03 03:10:38 +02:00
|
|
|
err = ext4_mark_inode_dirty(handle, inode);
|
|
|
|
if (err) {
|
2010-02-15 20:19:27 +01:00
|
|
|
ext4_warning(inode->i_sb,
|
2008-08-03 03:10:38 +02:00
|
|
|
"couldn't mark inode dirty (err %d)", err);
|
|
|
|
goto stop_handle;
|
|
|
|
}
|
2006-10-11 10:20:50 +02:00
|
|
|
if (inode->i_blocks)
|
2006-10-11 10:20:53 +02:00
|
|
|
ext4_truncate(inode);
|
2008-08-03 03:10:38 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
* ext4_ext_truncate() doesn't reserve any slop when it
|
|
|
|
* restarts journal transactions; therefore there may not be
|
|
|
|
* enough credits left in the handle to remove the inode from
|
|
|
|
* the orphan list and set the dtime field.
|
|
|
|
*/
|
2009-01-07 06:06:22 +01:00
|
|
|
if (!ext4_handle_has_enough_credits(handle, 3)) {
|
2008-08-03 03:10:38 +02:00
|
|
|
err = ext4_journal_extend(handle, 3);
|
|
|
|
if (err > 0)
|
|
|
|
err = ext4_journal_restart(handle, 3);
|
|
|
|
if (err != 0) {
|
2010-02-15 20:19:27 +01:00
|
|
|
ext4_warning(inode->i_sb,
|
2008-08-03 03:10:38 +02:00
|
|
|
"couldn't extend journal (err %d)", err);
|
|
|
|
stop_handle:
|
|
|
|
ext4_journal_stop(handle);
|
2010-07-29 21:06:10 +02:00
|
|
|
ext4_orphan_del(NULL, inode);
|
2008-08-03 03:10:38 +02:00
|
|
|
goto no_delete;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-10-11 10:20:50 +02:00
|
|
|
/*
|
2006-10-11 10:20:53 +02:00
|
|
|
* Kill off the orphan record which ext4_truncate created.
|
2006-10-11 10:20:50 +02:00
|
|
|
* AKPM: I think this can be inside the above `if'.
|
2006-10-11 10:20:53 +02:00
|
|
|
* Note that ext4_orphan_del() has to be able to cope with the
|
2006-10-11 10:20:50 +02:00
|
|
|
* deletion of a non-existent orphan - this is because we don't
|
2006-10-11 10:20:53 +02:00
|
|
|
* know if ext4_truncate() actually created an orphan record.
|
2006-10-11 10:20:50 +02:00
|
|
|
* (Well, we could do this if we need to, but heck - it works)
|
|
|
|
*/
|
2006-10-11 10:20:53 +02:00
|
|
|
ext4_orphan_del(handle, inode);
|
|
|
|
EXT4_I(inode)->i_dtime = get_seconds();
|
2006-10-11 10:20:50 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
* One subtle ordering requirement: if anything has gone wrong
|
|
|
|
* (transaction abort, IO errors, whatever), then we can still
|
|
|
|
* do these next steps (the fs will already have been marked as
|
|
|
|
* having errors), but we can't free the inode if the mark_dirty
|
|
|
|
* fails.
|
|
|
|
*/
|
2006-10-11 10:20:53 +02:00
|
|
|
if (ext4_mark_inode_dirty(handle, inode))
|
2006-10-11 10:20:50 +02:00
|
|
|
/* If that failed, just do the required in-core inode clear. */
|
2010-06-07 19:16:22 +02:00
|
|
|
ext4_clear_inode(inode);
|
2006-10-11 10:20:50 +02:00
|
|
|
else
|
2006-10-11 10:20:53 +02:00
|
|
|
ext4_free_inode(handle, inode);
|
|
|
|
ext4_journal_stop(handle);
|
2006-10-11 10:20:50 +02:00
|
|
|
return;
|
|
|
|
no_delete:
|
2010-06-07 19:16:22 +02:00
|
|
|
ext4_clear_inode(inode); /* We must guarantee clearing of inode... */
|
2006-10-11 10:20:50 +02:00
|
|
|
}
|
|
|
|
|
2009-12-14 13:21:14 +01:00
|
|
|
#ifdef CONFIG_QUOTA
|
|
|
|
qsize_t *ext4_get_reserved_space(struct inode *inode)
|
2009-01-22 18:13:05 +01:00
|
|
|
{
|
2009-12-14 13:21:14 +01:00
|
|
|
return &EXT4_I(inode)->i_reserved_quota;
|
2009-01-22 18:13:05 +01:00
|
|
|
}
|
2009-12-14 13:21:14 +01:00
|
|
|
#endif
|
2010-01-01 08:41:30 +01:00
|
|
|
|
2008-07-17 22:12:08 +02:00
|
|
|
/*
|
|
|
|
* Calculate the number of metadata blocks need to reserve
|
2010-01-01 08:41:30 +01:00
|
|
|
* to allocate a block located at @lblock
|
2008-07-17 22:12:08 +02:00
|
|
|
*/
|
2011-01-10 18:13:03 +01:00
|
|
|
static int ext4_calc_metadata_amount(struct inode *inode, ext4_lblk_t lblock)
|
2008-07-17 22:12:08 +02:00
|
|
|
{
|
2010-05-17 04:00:00 +02:00
|
|
|
if (ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS))
|
2010-01-01 08:41:30 +01:00
|
|
|
return ext4_ext_calc_metadata_amount(inode, lblock);
|
2008-07-17 22:12:08 +02:00
|
|
|
|
2011-06-27 23:10:28 +02:00
|
|
|
return ext4_ind_calc_metadata_amount(inode, lblock);
|
2008-07-17 22:12:08 +02:00
|
|
|
}
|
|
|
|
|
2009-12-30 20:20:45 +01:00
|
|
|
/*
|
|
|
|
* Called with i_data_sem down, which is important since we can call
|
|
|
|
* ext4_discard_preallocations() from here.
|
|
|
|
*/
|
2010-01-25 10:00:31 +01:00
|
|
|
void ext4_da_update_reserve_space(struct inode *inode,
|
|
|
|
int used, int quota_claim)
|
2008-07-17 22:12:08 +02:00
|
|
|
{
|
|
|
|
struct ext4_sb_info *sbi = EXT4_SB(inode->i_sb);
|
2009-12-30 20:20:45 +01:00
|
|
|
struct ext4_inode_info *ei = EXT4_I(inode);
|
|
|
|
|
|
|
|
spin_lock(&ei->i_block_reservation_lock);
|
2011-09-10 01:18:51 +02:00
|
|
|
trace_ext4_da_update_reserve_space(inode, used, quota_claim);
|
2009-12-30 20:20:45 +01:00
|
|
|
if (unlikely(used > ei->i_reserved_data_blocks)) {
|
|
|
|
ext4_msg(inode->i_sb, KERN_NOTICE, "%s: ino %lu, used %d "
|
|
|
|
"with only %d reserved data blocks\n",
|
|
|
|
__func__, inode->i_ino, used,
|
|
|
|
ei->i_reserved_data_blocks);
|
|
|
|
WARN_ON(1);
|
|
|
|
used = ei->i_reserved_data_blocks;
|
|
|
|
}
|
2008-07-17 22:12:08 +02:00
|
|
|
|
2009-12-30 20:20:45 +01:00
|
|
|
/* Update per-inode reservations */
|
|
|
|
ei->i_reserved_data_blocks -= used;
|
|
|
|
ei->i_reserved_meta_blocks -= ei->i_allocated_meta_blocks;
|
2011-09-10 00:56:51 +02:00
|
|
|
percpu_counter_sub(&sbi->s_dirtyclusters_counter,
|
2010-05-16 17:00:00 +02:00
|
|
|
used + ei->i_allocated_meta_blocks);
|
2009-12-30 20:20:45 +01:00
|
|
|
ei->i_allocated_meta_blocks = 0;
|
2008-10-10 15:39:00 +02:00
|
|
|
|
2009-12-30 20:20:45 +01:00
|
|
|
if (ei->i_reserved_data_blocks == 0) {
|
|
|
|
/*
|
|
|
|
* We can release all of the reserved metadata blocks
|
|
|
|
* only when we have written all of the delayed
|
|
|
|
* allocation blocks.
|
|
|
|
*/
|
2011-09-10 00:56:51 +02:00
|
|
|
percpu_counter_sub(&sbi->s_dirtyclusters_counter,
|
2010-05-16 17:00:00 +02:00
|
|
|
ei->i_reserved_meta_blocks);
|
2010-01-01 08:36:15 +01:00
|
|
|
ei->i_reserved_meta_blocks = 0;
|
2010-01-01 08:41:30 +01:00
|
|
|
ei->i_da_metadata_calc_len = 0;
|
2008-10-10 15:39:00 +02:00
|
|
|
}
|
2008-07-17 22:12:08 +02:00
|
|
|
spin_unlock(&EXT4_I(inode)->i_block_reservation_lock);
|
2009-01-22 18:13:05 +01:00
|
|
|
|
2010-05-16 17:00:00 +02:00
|
|
|
/* Update quota subsystem for data blocks */
|
|
|
|
if (quota_claim)
|
2011-09-10 01:04:51 +02:00
|
|
|
dquot_claim_block(inode, EXT4_C2B(sbi, used));
|
2010-05-16 17:00:00 +02:00
|
|
|
else {
|
2010-01-25 10:00:31 +01:00
|
|
|
/*
|
|
|
|
* We did fallocate with an offset that is already delayed
|
|
|
|
* allocated. So on delayed allocated writeback we should
|
2010-05-16 17:00:00 +02:00
|
|
|
* not re-claim the quota for fallocated blocks.
|
2010-01-25 10:00:31 +01:00
|
|
|
*/
|
2011-09-10 01:04:51 +02:00
|
|
|
dquot_release_reservation_block(inode, EXT4_C2B(sbi, used));
|
2010-01-25 10:00:31 +01:00
|
|
|
}
|
2009-03-28 03:36:43 +01:00
|
|
|
|
|
|
|
/*
|
|
|
|
* If we have done all the pending block allocations and if
|
|
|
|
* there aren't any writers on the inode, we can discard the
|
|
|
|
* inode's preallocations.
|
|
|
|
*/
|
2009-12-30 20:20:45 +01:00
|
|
|
if ((ei->i_reserved_data_blocks == 0) &&
|
|
|
|
(atomic_read(&inode->i_writecount) == 0))
|
2009-03-28 03:36:43 +01:00
|
|
|
ext4_discard_preallocations(inode);
|
2008-07-17 22:12:08 +02:00
|
|
|
}
|
|
|
|
|
2010-06-29 18:54:28 +02:00
|
|
|
static int __check_block_validity(struct inode *inode, const char *func,
|
2010-07-27 17:56:40 +02:00
|
|
|
unsigned int line,
|
|
|
|
struct ext4_map_blocks *map)
|
2009-05-17 21:38:01 +02:00
|
|
|
{
|
2010-05-17 03:00:00 +02:00
|
|
|
if (!ext4_data_block_valid(EXT4_SB(inode->i_sb), map->m_pblk,
|
|
|
|
map->m_len)) {
|
2010-07-27 17:56:40 +02:00
|
|
|
ext4_error_inode(inode, func, line, map->m_pblk,
|
|
|
|
"lblock %lu mapped to illegal pblock "
|
|
|
|
"(length %d)", (unsigned long) map->m_lblk,
|
|
|
|
map->m_len);
|
2009-05-17 21:38:01 +02:00
|
|
|
return -EIO;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2010-06-29 18:54:28 +02:00
|
|
|
#define check_block_validity(inode, map) \
|
2010-07-27 17:56:40 +02:00
|
|
|
__check_block_validity((inode), __func__, __LINE__, (map))
|
2010-06-29 18:54:28 +02:00
|
|
|
|
2009-09-29 19:31:31 +02:00
|
|
|
/*
|
2009-10-01 04:57:41 +02:00
|
|
|
* Return the number of contiguous dirty pages in a given inode
|
|
|
|
* starting at page frame idx.
|
2009-09-29 19:31:31 +02:00
|
|
|
*/
|
|
|
|
static pgoff_t ext4_num_dirty_pages(struct inode *inode, pgoff_t idx,
|
|
|
|
unsigned int max_pages)
|
|
|
|
{
|
|
|
|
struct address_space *mapping = inode->i_mapping;
|
|
|
|
pgoff_t index;
|
|
|
|
struct pagevec pvec;
|
|
|
|
pgoff_t num = 0;
|
|
|
|
int i, nr_pages, done = 0;
|
|
|
|
|
|
|
|
if (max_pages == 0)
|
|
|
|
return 0;
|
|
|
|
pagevec_init(&pvec, 0);
|
|
|
|
while (!done) {
|
|
|
|
index = idx;
|
|
|
|
nr_pages = pagevec_lookup_tag(&pvec, mapping, &index,
|
|
|
|
PAGECACHE_TAG_DIRTY,
|
|
|
|
(pgoff_t)PAGEVEC_SIZE);
|
|
|
|
if (nr_pages == 0)
|
|
|
|
break;
|
|
|
|
for (i = 0; i < nr_pages; i++) {
|
|
|
|
struct page *page = pvec.pages[i];
|
|
|
|
struct buffer_head *bh, *head;
|
|
|
|
|
|
|
|
lock_page(page);
|
|
|
|
if (unlikely(page->mapping != mapping) ||
|
|
|
|
!PageDirty(page) ||
|
|
|
|
PageWriteback(page) ||
|
|
|
|
page->index != idx) {
|
|
|
|
done = 1;
|
|
|
|
unlock_page(page);
|
|
|
|
break;
|
|
|
|
}
|
2009-10-01 04:57:41 +02:00
|
|
|
if (page_has_buffers(page)) {
|
|
|
|
bh = head = page_buffers(page);
|
|
|
|
do {
|
|
|
|
if (!buffer_delay(bh) &&
|
|
|
|
!buffer_unwritten(bh))
|
|
|
|
done = 1;
|
|
|
|
bh = bh->b_this_page;
|
|
|
|
} while (!done && (bh != head));
|
|
|
|
}
|
2009-09-29 19:31:31 +02:00
|
|
|
unlock_page(page);
|
|
|
|
if (done)
|
|
|
|
break;
|
|
|
|
idx++;
|
|
|
|
num++;
|
2010-10-28 03:30:03 +02:00
|
|
|
if (num >= max_pages) {
|
|
|
|
done = 1;
|
2009-09-29 19:31:31 +02:00
|
|
|
break;
|
2010-10-28 03:30:03 +02:00
|
|
|
}
|
2009-09-29 19:31:31 +02:00
|
|
|
}
|
|
|
|
pagevec_release(&pvec);
|
|
|
|
}
|
|
|
|
return num;
|
|
|
|
}
|
|
|
|
|
2011-09-10 01:20:51 +02:00
|
|
|
/*
|
|
|
|
* Sets the BH_Da_Mapped bit on the buffer heads corresponding to the given map.
|
|
|
|
*/
|
|
|
|
static void set_buffers_da_mapped(struct inode *inode,
|
|
|
|
struct ext4_map_blocks *map)
|
|
|
|
{
|
|
|
|
struct address_space *mapping = inode->i_mapping;
|
|
|
|
struct pagevec pvec;
|
|
|
|
int i, nr_pages;
|
|
|
|
pgoff_t index, end;
|
|
|
|
|
|
|
|
index = map->m_lblk >> (PAGE_CACHE_SHIFT - inode->i_blkbits);
|
|
|
|
end = (map->m_lblk + map->m_len - 1) >>
|
|
|
|
(PAGE_CACHE_SHIFT - inode->i_blkbits);
|
|
|
|
|
|
|
|
pagevec_init(&pvec, 0);
|
|
|
|
while (index <= end) {
|
|
|
|
nr_pages = pagevec_lookup(&pvec, mapping, index,
|
|
|
|
min(end - index + 1,
|
|
|
|
(pgoff_t)PAGEVEC_SIZE));
|
|
|
|
if (nr_pages == 0)
|
|
|
|
break;
|
|
|
|
for (i = 0; i < nr_pages; i++) {
|
|
|
|
struct page *page = pvec.pages[i];
|
|
|
|
struct buffer_head *bh, *head;
|
|
|
|
|
|
|
|
if (unlikely(page->mapping != mapping) ||
|
|
|
|
!PageDirty(page))
|
|
|
|
break;
|
|
|
|
|
|
|
|
if (page_has_buffers(page)) {
|
|
|
|
bh = head = page_buffers(page);
|
|
|
|
do {
|
|
|
|
set_buffer_da_mapped(bh);
|
|
|
|
bh = bh->b_this_page;
|
|
|
|
} while (bh != head);
|
|
|
|
}
|
|
|
|
index++;
|
|
|
|
}
|
|
|
|
pagevec_release(&pvec);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-02-25 21:29:55 +01:00
|
|
|
/*
|
2010-05-17 01:00:00 +02:00
|
|
|
* The ext4_map_blocks() function tries to look up the requested blocks,
|
2008-07-26 22:15:44 +02:00
|
|
|
* and returns if the blocks are already mapped.
|
2008-02-25 21:29:55 +01:00
|
|
|
*
|
|
|
|
* Otherwise it takes the write lock of the i_data_sem and allocate blocks
|
|
|
|
* and store the allocated blocks in the result buffer head and mark it
|
|
|
|
* mapped.
|
|
|
|
*
|
2010-05-17 01:00:00 +02:00
|
|
|
* If file type is extents based, it will call ext4_ext_map_blocks(),
|
|
|
|
* Otherwise, call with ext4_ind_map_blocks() to handle indirect mapping
|
2008-02-25 21:29:55 +01:00
|
|
|
* based files
|
|
|
|
*
|
|
|
|
* On success, it returns the number of blocks being mapped or allocate.
|
|
|
|
* if create==0 and the blocks are pre-allocated and uninitialized block,
|
|
|
|
* the result buffer head is unmapped. If the create ==1, it will make sure
|
|
|
|
* the buffer head is mapped.
|
|
|
|
*
|
|
|
|
* It returns 0 if plain look up failed (blocks have not been allocated), in
|
|
|
|
* that casem, buffer head is unmapped
|
|
|
|
*
|
|
|
|
* It returns the error in case of allocation failure.
|
|
|
|
*/
|
2010-05-17 01:00:00 +02:00
|
|
|
int ext4_map_blocks(handle_t *handle, struct inode *inode,
|
|
|
|
struct ext4_map_blocks *map, int flags)
|
2008-01-29 05:58:26 +01:00
|
|
|
{
|
|
|
|
int retval;
|
2008-02-25 21:29:55 +01:00
|
|
|
|
2010-05-17 01:00:00 +02:00
|
|
|
map->m_flags = 0;
|
|
|
|
ext_debug("ext4_map_blocks(): inode %lu, flag %d, max_blocks %u,"
|
|
|
|
"logical block %lu\n", inode->i_ino, flags, map->m_len,
|
|
|
|
(unsigned long) map->m_lblk);
|
2008-01-29 05:58:29 +01:00
|
|
|
/*
|
2009-05-14 06:54:29 +02:00
|
|
|
* Try to see if we can get the block without requesting a new
|
|
|
|
* file system block.
|
2008-01-29 05:58:29 +01:00
|
|
|
*/
|
|
|
|
down_read((&EXT4_I(inode)->i_data_sem));
|
2010-05-17 04:00:00 +02:00
|
|
|
if (ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS)) {
|
2010-05-17 01:00:00 +02:00
|
|
|
retval = ext4_ext_map_blocks(handle, inode, map, 0);
|
2008-01-29 05:58:26 +01:00
|
|
|
} else {
|
2010-05-17 01:00:00 +02:00
|
|
|
retval = ext4_ind_map_blocks(handle, inode, map, 0);
|
2008-01-29 05:58:26 +01:00
|
|
|
}
|
2008-01-29 05:58:29 +01:00
|
|
|
up_read((&EXT4_I(inode)->i_data_sem));
|
2008-02-25 21:29:55 +01:00
|
|
|
|
2010-05-17 01:00:00 +02:00
|
|
|
if (retval > 0 && map->m_flags & EXT4_MAP_MAPPED) {
|
2010-06-29 18:54:28 +02:00
|
|
|
int ret = check_block_validity(inode, map);
|
2009-05-17 21:38:01 +02:00
|
|
|
if (ret != 0)
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2008-02-25 21:29:55 +01:00
|
|
|
/* If it is only a block(s) look up */
|
2009-05-14 06:58:52 +02:00
|
|
|
if ((flags & EXT4_GET_BLOCKS_CREATE) == 0)
|
2008-02-25 21:29:55 +01:00
|
|
|
return retval;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Returns if the blocks have already allocated
|
|
|
|
*
|
|
|
|
* Note that if blocks have been preallocated
|
|
|
|
* ext4_ext_get_block() returns th create = 0
|
|
|
|
* with buffer head unmapped.
|
|
|
|
*/
|
2010-05-17 01:00:00 +02:00
|
|
|
if (retval > 0 && map->m_flags & EXT4_MAP_MAPPED)
|
2008-01-29 05:58:29 +01:00
|
|
|
return retval;
|
|
|
|
|
2009-05-14 23:05:39 +02:00
|
|
|
/*
|
|
|
|
* When we call get_blocks without the create flag, the
|
|
|
|
* BH_Unwritten flag could have gotten set if the blocks
|
|
|
|
* requested were part of a uninitialized extent. We need to
|
|
|
|
* clear this flag now that we are committed to convert all or
|
|
|
|
* part of the uninitialized extent to be an initialized
|
|
|
|
* extent. This is because we need to avoid the combination
|
|
|
|
* of BH_Unwritten and BH_Mapped flags being simultaneously
|
|
|
|
* set on the buffer_head.
|
|
|
|
*/
|
2010-05-17 01:00:00 +02:00
|
|
|
map->m_flags &= ~EXT4_MAP_UNWRITTEN;
|
2009-05-14 23:05:39 +02:00
|
|
|
|
2008-01-29 05:58:29 +01:00
|
|
|
/*
|
2008-02-25 21:29:55 +01:00
|
|
|
* New blocks allocate and/or writing to uninitialized extent
|
|
|
|
* will possibly result in updating i_data, so we take
|
|
|
|
* the write lock of i_data_sem, and call get_blocks()
|
|
|
|
* with create == 1 flag.
|
2008-01-29 05:58:29 +01:00
|
|
|
*/
|
|
|
|
down_write((&EXT4_I(inode)->i_data_sem));
|
2008-07-14 23:52:37 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
* if the caller is from delayed allocation writeout path
|
|
|
|
* we have already reserved fs blocks for allocation
|
|
|
|
* let the underlying get_block() function know to
|
|
|
|
* avoid double accounting
|
|
|
|
*/
|
2009-05-14 06:58:52 +02:00
|
|
|
if (flags & EXT4_GET_BLOCKS_DELALLOC_RESERVE)
|
2011-01-10 18:12:36 +01:00
|
|
|
ext4_set_inode_state(inode, EXT4_STATE_DELALLOC_RESERVED);
|
2008-01-29 05:58:29 +01:00
|
|
|
/*
|
|
|
|
* We need to check for EXT4 here because migrate
|
|
|
|
* could have changed the inode type in between
|
|
|
|
*/
|
2010-05-17 04:00:00 +02:00
|
|
|
if (ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS)) {
|
2010-05-17 01:00:00 +02:00
|
|
|
retval = ext4_ext_map_blocks(handle, inode, map, flags);
|
2008-01-29 05:58:26 +01:00
|
|
|
} else {
|
2010-05-17 01:00:00 +02:00
|
|
|
retval = ext4_ind_map_blocks(handle, inode, map, flags);
|
2008-04-29 14:11:12 +02:00
|
|
|
|
2010-05-17 01:00:00 +02:00
|
|
|
if (retval > 0 && map->m_flags & EXT4_MAP_NEW) {
|
2008-04-29 14:11:12 +02:00
|
|
|
/*
|
|
|
|
* We allocated new blocks which will result in
|
|
|
|
* i_data's format changing. Force the migrate
|
|
|
|
* to fail by clearing migrate flags
|
|
|
|
*/
|
2010-01-24 20:34:07 +01:00
|
|
|
ext4_clear_inode_state(inode, EXT4_STATE_EXT_MIGRATE);
|
2008-04-29 14:11:12 +02:00
|
|
|
}
|
2008-07-14 23:52:37 +02:00
|
|
|
|
2010-01-25 10:00:31 +01:00
|
|
|
/*
|
|
|
|
* Update reserved blocks/metadata blocks after successful
|
|
|
|
* block allocation which had been deferred till now. We don't
|
|
|
|
* support fallocate for non extent files. So we can update
|
|
|
|
* reserve space here.
|
|
|
|
*/
|
|
|
|
if ((retval > 0) &&
|
2010-01-15 07:27:59 +01:00
|
|
|
(flags & EXT4_GET_BLOCKS_DELALLOC_RESERVE))
|
2010-01-25 10:00:31 +01:00
|
|
|
ext4_da_update_reserve_space(inode, retval, 1);
|
|
|
|
}
|
2011-09-10 01:20:51 +02:00
|
|
|
if (flags & EXT4_GET_BLOCKS_DELALLOC_RESERVE) {
|
2011-01-10 18:12:36 +01:00
|
|
|
ext4_clear_inode_state(inode, EXT4_STATE_DELALLOC_RESERVED);
|
2009-05-14 19:57:08 +02:00
|
|
|
|
2011-09-10 01:20:51 +02:00
|
|
|
/* If we have successfully mapped the delayed allocated blocks,
|
|
|
|
* set the BH_Da_Mapped bit on them. Its important to do this
|
|
|
|
* under the protection of i_data_sem.
|
|
|
|
*/
|
|
|
|
if (retval > 0 && map->m_flags & EXT4_MAP_MAPPED)
|
|
|
|
set_buffers_da_mapped(inode, map);
|
|
|
|
}
|
|
|
|
|
2008-01-29 05:58:29 +01:00
|
|
|
up_write((&EXT4_I(inode)->i_data_sem));
|
2010-05-17 01:00:00 +02:00
|
|
|
if (retval > 0 && map->m_flags & EXT4_MAP_MAPPED) {
|
2010-06-29 18:54:28 +02:00
|
|
|
int ret = check_block_validity(inode, map);
|
2009-05-17 21:38:01 +02:00
|
|
|
if (ret != 0)
|
|
|
|
return ret;
|
|
|
|
}
|
2008-01-29 05:58:26 +01:00
|
|
|
return retval;
|
|
|
|
}
|
|
|
|
|
2008-08-20 04:16:03 +02:00
|
|
|
/* Maximum number of blocks we map for direct IO at once. */
|
|
|
|
#define DIO_MAX_BLOCKS 4096
|
|
|
|
|
2010-05-17 02:00:00 +02:00
|
|
|
static int _ext4_get_block(struct inode *inode, sector_t iblock,
|
|
|
|
struct buffer_head *bh, int flags)
|
2006-10-11 10:20:50 +02:00
|
|
|
{
|
2007-02-10 10:46:35 +01:00
|
|
|
handle_t *handle = ext4_journal_current_handle();
|
2010-05-17 02:00:00 +02:00
|
|
|
struct ext4_map_blocks map;
|
2008-02-10 07:08:38 +01:00
|
|
|
int ret = 0, started = 0;
|
2008-08-20 04:16:03 +02:00
|
|
|
int dio_credits;
|
2006-10-11 10:20:50 +02:00
|
|
|
|
2010-05-17 02:00:00 +02:00
|
|
|
map.m_lblk = iblock;
|
|
|
|
map.m_len = bh->b_size >> inode->i_blkbits;
|
|
|
|
|
|
|
|
if (flags && !handle) {
|
2008-02-10 07:08:38 +01:00
|
|
|
/* Direct IO write... */
|
2010-05-17 02:00:00 +02:00
|
|
|
if (map.m_len > DIO_MAX_BLOCKS)
|
|
|
|
map.m_len = DIO_MAX_BLOCKS;
|
|
|
|
dio_credits = ext4_chunk_trans_blocks(inode, map.m_len);
|
2008-08-20 04:16:03 +02:00
|
|
|
handle = ext4_journal_start(inode, dio_credits);
|
2008-02-10 07:08:38 +01:00
|
|
|
if (IS_ERR(handle)) {
|
2006-10-11 10:20:50 +02:00
|
|
|
ret = PTR_ERR(handle);
|
2010-05-17 02:00:00 +02:00
|
|
|
return ret;
|
2006-10-11 10:20:50 +02:00
|
|
|
}
|
2008-02-10 07:08:38 +01:00
|
|
|
started = 1;
|
2006-10-11 10:20:50 +02:00
|
|
|
}
|
|
|
|
|
2010-05-17 02:00:00 +02:00
|
|
|
ret = ext4_map_blocks(handle, inode, &map, flags);
|
2008-02-10 07:08:38 +01:00
|
|
|
if (ret > 0) {
|
2010-05-17 02:00:00 +02:00
|
|
|
map_bh(bh, inode->i_sb, map.m_pblk);
|
|
|
|
bh->b_state = (bh->b_state & ~EXT4_MAP_FLAGS) | map.m_flags;
|
|
|
|
bh->b_size = inode->i_sb->s_blocksize * map.m_len;
|
2008-02-10 07:08:38 +01:00
|
|
|
ret = 0;
|
2006-10-11 10:20:50 +02:00
|
|
|
}
|
2008-02-10 07:08:38 +01:00
|
|
|
if (started)
|
|
|
|
ext4_journal_stop(handle);
|
2006-10-11 10:20:50 +02:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2010-05-17 02:00:00 +02:00
|
|
|
int ext4_get_block(struct inode *inode, sector_t iblock,
|
|
|
|
struct buffer_head *bh, int create)
|
|
|
|
{
|
|
|
|
return _ext4_get_block(inode, iblock, bh,
|
|
|
|
create ? EXT4_GET_BLOCKS_CREATE : 0);
|
|
|
|
}
|
|
|
|
|
2006-10-11 10:20:50 +02:00
|
|
|
/*
|
|
|
|
* `handle' can be NULL if create is zero
|
|
|
|
*/
|
2006-10-11 10:20:53 +02:00
|
|
|
struct buffer_head *ext4_getblk(handle_t *handle, struct inode *inode,
|
2008-01-29 05:58:27 +01:00
|
|
|
ext4_lblk_t block, int create, int *errp)
|
2006-10-11 10:20:50 +02:00
|
|
|
{
|
2010-05-17 02:00:00 +02:00
|
|
|
struct ext4_map_blocks map;
|
|
|
|
struct buffer_head *bh;
|
2006-10-11 10:20:50 +02:00
|
|
|
int fatal = 0, err;
|
|
|
|
|
|
|
|
J_ASSERT(handle != NULL || create == 0);
|
|
|
|
|
2010-05-17 02:00:00 +02:00
|
|
|
map.m_lblk = block;
|
|
|
|
map.m_len = 1;
|
|
|
|
err = ext4_map_blocks(handle, inode, &map,
|
|
|
|
create ? EXT4_GET_BLOCKS_CREATE : 0);
|
2006-10-11 10:20:50 +02:00
|
|
|
|
2010-05-17 02:00:00 +02:00
|
|
|
if (err < 0)
|
|
|
|
*errp = err;
|
|
|
|
if (err <= 0)
|
|
|
|
return NULL;
|
|
|
|
*errp = 0;
|
|
|
|
|
|
|
|
bh = sb_getblk(inode->i_sb, map.m_pblk);
|
|
|
|
if (!bh) {
|
|
|
|
*errp = -EIO;
|
|
|
|
return NULL;
|
2006-10-11 10:20:50 +02:00
|
|
|
}
|
2010-05-17 02:00:00 +02:00
|
|
|
if (map.m_flags & EXT4_MAP_NEW) {
|
|
|
|
J_ASSERT(create != 0);
|
|
|
|
J_ASSERT(handle != NULL);
|
2006-10-11 10:20:50 +02:00
|
|
|
|
2010-05-17 02:00:00 +02:00
|
|
|
/*
|
|
|
|
* Now that we do not always journal data, we should
|
|
|
|
* keep in mind whether this should always journal the
|
|
|
|
* new buffer as metadata. For now, regular file
|
|
|
|
* writes use ext4_get_block instead, so it's not a
|
|
|
|
* problem.
|
|
|
|
*/
|
|
|
|
lock_buffer(bh);
|
|
|
|
BUFFER_TRACE(bh, "call get_create_access");
|
|
|
|
fatal = ext4_journal_get_create_access(handle, bh);
|
|
|
|
if (!fatal && !buffer_uptodate(bh)) {
|
|
|
|
memset(bh->b_data, 0, inode->i_sb->s_blocksize);
|
|
|
|
set_buffer_uptodate(bh);
|
2006-10-11 10:20:50 +02:00
|
|
|
}
|
2010-05-17 02:00:00 +02:00
|
|
|
unlock_buffer(bh);
|
|
|
|
BUFFER_TRACE(bh, "call ext4_handle_dirty_metadata");
|
|
|
|
err = ext4_handle_dirty_metadata(handle, inode, bh);
|
|
|
|
if (!fatal)
|
|
|
|
fatal = err;
|
|
|
|
} else {
|
|
|
|
BUFFER_TRACE(bh, "not a new buffer");
|
2006-10-11 10:20:50 +02:00
|
|
|
}
|
2010-05-17 02:00:00 +02:00
|
|
|
if (fatal) {
|
|
|
|
*errp = fatal;
|
|
|
|
brelse(bh);
|
|
|
|
bh = NULL;
|
|
|
|
}
|
|
|
|
return bh;
|
2006-10-11 10:20:50 +02:00
|
|
|
}
|
|
|
|
|
2006-10-11 10:20:53 +02:00
|
|
|
struct buffer_head *ext4_bread(handle_t *handle, struct inode *inode,
|
2008-01-29 05:58:27 +01:00
|
|
|
ext4_lblk_t block, int create, int *err)
|
2006-10-11 10:20:50 +02:00
|
|
|
{
|
2008-09-09 04:25:24 +02:00
|
|
|
struct buffer_head *bh;
|
2006-10-11 10:20:50 +02:00
|
|
|
|
2006-10-11 10:20:53 +02:00
|
|
|
bh = ext4_getblk(handle, inode, block, create, err);
|
2006-10-11 10:20:50 +02:00
|
|
|
if (!bh)
|
|
|
|
return bh;
|
|
|
|
if (buffer_uptodate(bh))
|
|
|
|
return bh;
|
|
|
|
ll_rw_block(READ_META, 1, &bh);
|
|
|
|
wait_on_buffer(bh);
|
|
|
|
if (buffer_uptodate(bh))
|
|
|
|
return bh;
|
|
|
|
put_bh(bh);
|
|
|
|
*err = -EIO;
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2008-09-09 04:25:24 +02:00
|
|
|
static int walk_page_buffers(handle_t *handle,
|
|
|
|
struct buffer_head *head,
|
|
|
|
unsigned from,
|
|
|
|
unsigned to,
|
|
|
|
int *partial,
|
|
|
|
int (*fn)(handle_t *handle,
|
|
|
|
struct buffer_head *bh))
|
2006-10-11 10:20:50 +02:00
|
|
|
{
|
|
|
|
struct buffer_head *bh;
|
|
|
|
unsigned block_start, block_end;
|
|
|
|
unsigned blocksize = head->b_size;
|
|
|
|
int err, ret = 0;
|
|
|
|
struct buffer_head *next;
|
|
|
|
|
2008-09-09 04:25:24 +02:00
|
|
|
for (bh = head, block_start = 0;
|
|
|
|
ret == 0 && (bh != head || !block_start);
|
2009-06-14 23:45:34 +02:00
|
|
|
block_start = block_end, bh = next) {
|
2006-10-11 10:20:50 +02:00
|
|
|
next = bh->b_this_page;
|
|
|
|
block_end = block_start + blocksize;
|
|
|
|
if (block_end <= from || block_start >= to) {
|
|
|
|
if (partial && !buffer_uptodate(bh))
|
|
|
|
*partial = 1;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
err = (*fn)(handle, bh);
|
|
|
|
if (!ret)
|
|
|
|
ret = err;
|
|
|
|
}
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* To preserve ordering, it is essential that the hole instantiation and
|
|
|
|
* the data write be encapsulated in a single transaction. We cannot
|
2006-10-11 10:20:53 +02:00
|
|
|
* close off a transaction and start a new one between the ext4_get_block()
|
2006-10-11 10:21:01 +02:00
|
|
|
* and the commit_write(). So doing the jbd2_journal_start at the start of
|
2006-10-11 10:20:50 +02:00
|
|
|
* prepare_write() is the right place.
|
|
|
|
*
|
2006-10-11 10:20:53 +02:00
|
|
|
* Also, this function can nest inside ext4_writepage() ->
|
|
|
|
* block_write_full_page(). In that case, we *know* that ext4_writepage()
|
2006-10-11 10:20:50 +02:00
|
|
|
* has generated enough buffer credits to do the whole page. So we won't
|
|
|
|
* block on the journal in that case, which is good, because the caller may
|
|
|
|
* be PF_MEMALLOC.
|
|
|
|
*
|
2006-10-11 10:20:53 +02:00
|
|
|
* By accident, ext4 can be reentered when a transaction is open via
|
2006-10-11 10:20:50 +02:00
|
|
|
* quota file writes. If we were to commit the transaction while thus
|
|
|
|
* reentered, there can be a deadlock - we would be holding a quota
|
|
|
|
* lock, and the commit would never complete if another thread had a
|
|
|
|
* transaction open and was blocking on the quota lock - a ranking
|
|
|
|
* violation.
|
|
|
|
*
|
2006-10-11 10:21:01 +02:00
|
|
|
* So what we do is to rely on the fact that jbd2_journal_stop/journal_start
|
2006-10-11 10:20:50 +02:00
|
|
|
* will _not_ run commit under these circumstances because handle->h_ref
|
|
|
|
* is elevated. We'll still have enough credits for the tiny quotafile
|
|
|
|
* write.
|
|
|
|
*/
|
|
|
|
static int do_journal_get_write_access(handle_t *handle,
|
2009-06-14 23:45:34 +02:00
|
|
|
struct buffer_head *bh)
|
2006-10-11 10:20:50 +02:00
|
|
|
{
|
2010-08-05 20:41:42 +02:00
|
|
|
int dirty = buffer_dirty(bh);
|
|
|
|
int ret;
|
|
|
|
|
2006-10-11 10:20:50 +02:00
|
|
|
if (!buffer_mapped(bh) || buffer_freed(bh))
|
|
|
|
return 0;
|
2010-08-05 20:41:42 +02:00
|
|
|
/*
|
2010-10-06 10:47:23 +02:00
|
|
|
* __block_write_begin() could have dirtied some buffers. Clean
|
2010-08-05 20:41:42 +02:00
|
|
|
* the dirty bit as jbd2_journal_get_write_access() could complain
|
|
|
|
* otherwise about fs integrity issues. Setting of the dirty bit
|
2010-10-06 10:47:23 +02:00
|
|
|
* by __block_write_begin() isn't a real problem here as we clear
|
2010-08-05 20:41:42 +02:00
|
|
|
* the bit before releasing a page lock and thus writeback cannot
|
|
|
|
* ever write the buffer.
|
|
|
|
*/
|
|
|
|
if (dirty)
|
|
|
|
clear_buffer_dirty(bh);
|
|
|
|
ret = ext4_journal_get_write_access(handle, bh);
|
|
|
|
if (!ret && dirty)
|
|
|
|
ret = ext4_handle_dirty_metadata(handle, NULL, bh);
|
|
|
|
return ret;
|
2006-10-11 10:20:50 +02:00
|
|
|
}
|
|
|
|
|
2010-03-04 22:14:02 +01:00
|
|
|
static int ext4_get_block_write(struct inode *inode, sector_t iblock,
|
|
|
|
struct buffer_head *bh_result, int create);
|
2007-10-16 10:25:05 +02:00
|
|
|
static int ext4_write_begin(struct file *file, struct address_space *mapping,
|
2009-06-14 23:45:34 +02:00
|
|
|
loff_t pos, unsigned len, unsigned flags,
|
|
|
|
struct page **pagep, void **fsdata)
|
2006-10-11 10:20:50 +02:00
|
|
|
{
|
2008-09-09 04:25:24 +02:00
|
|
|
struct inode *inode = mapping->host;
|
2009-06-05 07:00:26 +02:00
|
|
|
int ret, needed_blocks;
|
2006-10-11 10:20:50 +02:00
|
|
|
handle_t *handle;
|
|
|
|
int retries = 0;
|
2008-09-09 04:25:24 +02:00
|
|
|
struct page *page;
|
2009-06-14 23:45:34 +02:00
|
|
|
pgoff_t index;
|
2008-09-09 04:25:24 +02:00
|
|
|
unsigned from, to;
|
2007-10-16 10:25:05 +02:00
|
|
|
|
2009-06-17 17:48:11 +02:00
|
|
|
trace_ext4_write_begin(inode, pos, len, flags);
|
2009-06-05 07:00:26 +02:00
|
|
|
/*
|
|
|
|
* Reserve one block more for addition to orphan list in case
|
|
|
|
* we allocate blocks but write fails for some reason
|
|
|
|
*/
|
|
|
|
needed_blocks = ext4_writepage_trans_blocks(inode) + 1;
|
2009-06-14 23:45:34 +02:00
|
|
|
index = pos >> PAGE_CACHE_SHIFT;
|
2008-09-09 04:25:24 +02:00
|
|
|
from = pos & (PAGE_CACHE_SIZE - 1);
|
|
|
|
to = from + len;
|
2006-10-11 10:20:50 +02:00
|
|
|
|
|
|
|
retry:
|
2008-09-09 04:25:24 +02:00
|
|
|
handle = ext4_journal_start(inode, needed_blocks);
|
|
|
|
if (IS_ERR(handle)) {
|
|
|
|
ret = PTR_ERR(handle);
|
|
|
|
goto out;
|
2007-04-02 08:49:44 +02:00
|
|
|
}
|
2006-10-11 10:20:50 +02:00
|
|
|
|
2009-02-23 03:09:59 +01:00
|
|
|
/* We cannot recurse into the filesystem as the transaction is already
|
|
|
|
* started */
|
|
|
|
flags |= AOP_FLAG_NOFS;
|
|
|
|
|
fs: symlink write_begin allocation context fix
With the write_begin/write_end aops, page_symlink was broken because it
could no longer pass a GFP_NOFS type mask into the point where the
allocations happened. They are done in write_begin, which would always
assume that the filesystem can be entered from reclaim. This bug could
cause filesystem deadlocks.
The funny thing with having a gfp_t mask there is that it doesn't really
allow the caller to arbitrarily tinker with the context in which it can be
called. It couldn't ever be GFP_ATOMIC, for example, because it needs to
take the page lock. The only thing any callers care about is __GFP_FS
anyway, so turn that into a single flag.
Add a new flag for write_begin, AOP_FLAG_NOFS. Filesystems can now act on
this flag in their write_begin function. Change __grab_cache_page to
accept a nofs argument as well, to honour that flag (while we're there,
change the name to grab_cache_page_write_begin which is more instructive
and does away with random leading underscores).
This is really a more flexible way to go in the end anyway -- if a
filesystem happens to want any extra allocations aside from the pagecache
ones in ints write_begin function, it may now use GFP_KERNEL (rather than
GFP_NOFS) for common case allocations (eg. ocfs2_alloc_write_ctxt, for a
random example).
[kosaki.motohiro@jp.fujitsu.com: fix ubifs]
[kosaki.motohiro@jp.fujitsu.com: fix fuse]
Signed-off-by: Nick Piggin <npiggin@suse.de>
Reviewed-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Cc: <stable@kernel.org> [2.6.28.x]
Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
[ Cleaned up the calling convention: just pass in the AOP flags
untouched to the grab_cache_page_write_begin() function. That
just simplifies everybody, and may even allow future expansion of the
logic. - Linus ]
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2009-01-04 21:00:53 +01:00
|
|
|
page = grab_cache_page_write_begin(mapping, index, flags);
|
2008-07-12 01:27:31 +02:00
|
|
|
if (!page) {
|
|
|
|
ext4_journal_stop(handle);
|
|
|
|
ret = -ENOMEM;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
*pagep = page;
|
|
|
|
|
2010-03-04 22:14:02 +01:00
|
|
|
if (ext4_should_dioread_nolock(inode))
|
2010-06-04 11:29:57 +02:00
|
|
|
ret = __block_write_begin(page, pos, len, ext4_get_block_write);
|
2010-03-04 22:14:02 +01:00
|
|
|
else
|
2010-06-04 11:29:57 +02:00
|
|
|
ret = __block_write_begin(page, pos, len, ext4_get_block);
|
2007-10-16 10:25:05 +02:00
|
|
|
|
|
|
|
if (!ret && ext4_should_journal_data(inode)) {
|
2006-10-11 10:20:50 +02:00
|
|
|
ret = walk_page_buffers(handle, page_buffers(page),
|
|
|
|
from, to, NULL, do_journal_get_write_access);
|
|
|
|
}
|
2007-10-16 10:25:05 +02:00
|
|
|
|
|
|
|
if (ret) {
|
2008-09-09 04:25:24 +02:00
|
|
|
unlock_page(page);
|
|
|
|
page_cache_release(page);
|
2008-09-13 19:10:25 +02:00
|
|
|
/*
|
2010-06-04 11:29:57 +02:00
|
|
|
* __block_write_begin may have instantiated a few blocks
|
2008-09-13 19:10:25 +02:00
|
|
|
* outside i_size. Trim these off again. Don't need
|
|
|
|
* i_size_read because we hold i_mutex.
|
2009-06-05 07:00:26 +02:00
|
|
|
*
|
|
|
|
* Add inode to orphan list in case we crash before
|
|
|
|
* truncate finishes
|
2008-09-13 19:10:25 +02:00
|
|
|
*/
|
2009-07-13 22:22:22 +02:00
|
|
|
if (pos + len > inode->i_size && ext4_can_truncate(inode))
|
2009-06-05 07:00:26 +02:00
|
|
|
ext4_orphan_add(handle, inode);
|
|
|
|
|
|
|
|
ext4_journal_stop(handle);
|
|
|
|
if (pos + len > inode->i_size) {
|
2009-12-09 03:24:33 +01:00
|
|
|
ext4_truncate_failed_write(inode);
|
2009-06-14 23:45:34 +02:00
|
|
|
/*
|
2009-07-13 22:22:22 +02:00
|
|
|
* If truncate failed early the inode might
|
2009-06-05 07:00:26 +02:00
|
|
|
* still be on the orphan list; we need to
|
|
|
|
* make sure the inode is removed from the
|
|
|
|
* orphan list in that case.
|
|
|
|
*/
|
|
|
|
if (inode->i_nlink)
|
|
|
|
ext4_orphan_del(NULL, inode);
|
|
|
|
}
|
2007-10-16 10:25:05 +02:00
|
|
|
}
|
|
|
|
|
2006-10-11 10:20:53 +02:00
|
|
|
if (ret == -ENOSPC && ext4_should_retry_alloc(inode->i_sb, &retries))
|
2006-10-11 10:20:50 +02:00
|
|
|
goto retry;
|
2007-04-02 08:49:44 +02:00
|
|
|
out:
|
2006-10-11 10:20:50 +02:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2007-10-16 10:25:05 +02:00
|
|
|
/* For write_end() in data=journal mode */
|
|
|
|
static int write_end_fn(handle_t *handle, struct buffer_head *bh)
|
2006-10-11 10:20:50 +02:00
|
|
|
{
|
|
|
|
if (!buffer_mapped(bh) || buffer_freed(bh))
|
|
|
|
return 0;
|
|
|
|
set_buffer_uptodate(bh);
|
2009-01-07 06:06:22 +01:00
|
|
|
return ext4_handle_dirty_metadata(handle, NULL, bh);
|
2006-10-11 10:20:50 +02:00
|
|
|
}
|
|
|
|
|
2009-06-05 06:56:49 +02:00
|
|
|
static int ext4_generic_write_end(struct file *file,
|
2009-06-14 23:45:34 +02:00
|
|
|
struct address_space *mapping,
|
|
|
|
loff_t pos, unsigned len, unsigned copied,
|
|
|
|
struct page *page, void *fsdata)
|
2009-06-05 06:56:49 +02:00
|
|
|
{
|
|
|
|
int i_size_changed = 0;
|
|
|
|
struct inode *inode = mapping->host;
|
|
|
|
handle_t *handle = ext4_journal_current_handle();
|
|
|
|
|
|
|
|
copied = block_write_end(file, mapping, pos, len, copied, page, fsdata);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* No need to use i_size_read() here, the i_size
|
|
|
|
* cannot change under us because we hold i_mutex.
|
|
|
|
*
|
|
|
|
* But it's important to update i_size while still holding page lock:
|
|
|
|
* page writeout could otherwise come in and zero beyond i_size.
|
|
|
|
*/
|
|
|
|
if (pos + copied > inode->i_size) {
|
|
|
|
i_size_write(inode, pos + copied);
|
|
|
|
i_size_changed = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (pos + copied > EXT4_I(inode)->i_disksize) {
|
|
|
|
/* We need to mark inode dirty even if
|
|
|
|
* new_i_size is less that inode->i_size
|
|
|
|
* bu greater than i_disksize.(hint delalloc)
|
|
|
|
*/
|
|
|
|
ext4_update_i_disksize(inode, (pos + copied));
|
|
|
|
i_size_changed = 1;
|
|
|
|
}
|
|
|
|
unlock_page(page);
|
|
|
|
page_cache_release(page);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Don't mark the inode dirty under page lock. First, it unnecessarily
|
|
|
|
* makes the holding time of page lock longer. Second, it forces lock
|
|
|
|
* ordering of page lock and transaction start for journaling
|
|
|
|
* filesystems.
|
|
|
|
*/
|
|
|
|
if (i_size_changed)
|
|
|
|
ext4_mark_inode_dirty(handle, inode);
|
|
|
|
|
|
|
|
return copied;
|
|
|
|
}
|
|
|
|
|
2006-10-11 10:20:50 +02:00
|
|
|
/*
|
|
|
|
* We need to pick up the new inode size which generic_commit_write gave us
|
|
|
|
* `file' can be NULL - eg, when called from page_symlink().
|
|
|
|
*
|
2006-10-11 10:20:53 +02:00
|
|
|
* ext4 never places buffers on inode->i_mapping->private_list. metadata
|
2006-10-11 10:20:50 +02:00
|
|
|
* buffers are managed internally.
|
|
|
|
*/
|
2007-10-16 10:25:05 +02:00
|
|
|
static int ext4_ordered_write_end(struct file *file,
|
2009-06-14 23:45:34 +02:00
|
|
|
struct address_space *mapping,
|
|
|
|
loff_t pos, unsigned len, unsigned copied,
|
|
|
|
struct page *page, void *fsdata)
|
2006-10-11 10:20:50 +02:00
|
|
|
{
|
2006-10-11 10:20:53 +02:00
|
|
|
handle_t *handle = ext4_journal_current_handle();
|
2008-07-12 01:27:31 +02:00
|
|
|
struct inode *inode = mapping->host;
|
2006-10-11 10:20:50 +02:00
|
|
|
int ret = 0, ret2;
|
|
|
|
|
2009-06-17 17:48:11 +02:00
|
|
|
trace_ext4_ordered_write_end(inode, pos, len, copied);
|
2008-07-12 01:27:31 +02:00
|
|
|
ret = ext4_jbd2_file_inode(handle, inode);
|
2006-10-11 10:20:50 +02:00
|
|
|
|
|
|
|
if (ret == 0) {
|
2009-06-05 06:56:49 +02:00
|
|
|
ret2 = ext4_generic_write_end(file, mapping, pos, len, copied,
|
2007-10-16 10:25:05 +02:00
|
|
|
page, fsdata);
|
2008-04-30 04:01:18 +02:00
|
|
|
copied = ret2;
|
2009-07-13 22:22:22 +02:00
|
|
|
if (pos + len > inode->i_size && ext4_can_truncate(inode))
|
2009-06-05 06:56:49 +02:00
|
|
|
/* if we have allocated more blocks and copied
|
|
|
|
* less. We will have blocks allocated outside
|
|
|
|
* inode->i_size. So truncate them
|
|
|
|
*/
|
|
|
|
ext4_orphan_add(handle, inode);
|
2008-04-30 04:01:18 +02:00
|
|
|
if (ret2 < 0)
|
|
|
|
ret = ret2;
|
2006-10-11 10:20:50 +02:00
|
|
|
}
|
2006-10-11 10:20:53 +02:00
|
|
|
ret2 = ext4_journal_stop(handle);
|
2006-10-11 10:20:50 +02:00
|
|
|
if (!ret)
|
|
|
|
ret = ret2;
|
2007-10-16 10:25:05 +02:00
|
|
|
|
2009-06-05 06:56:49 +02:00
|
|
|
if (pos + len > inode->i_size) {
|
2009-12-09 03:24:33 +01:00
|
|
|
ext4_truncate_failed_write(inode);
|
2009-06-14 23:45:34 +02:00
|
|
|
/*
|
2009-07-13 22:22:22 +02:00
|
|
|
* If truncate failed early the inode might still be
|
2009-06-05 06:56:49 +02:00
|
|
|
* on the orphan list; we need to make sure the inode
|
|
|
|
* is removed from the orphan list in that case.
|
|
|
|
*/
|
|
|
|
if (inode->i_nlink)
|
|
|
|
ext4_orphan_del(NULL, inode);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2007-10-16 10:25:05 +02:00
|
|
|
return ret ? ret : copied;
|
2006-10-11 10:20:50 +02:00
|
|
|
}
|
|
|
|
|
2007-10-16 10:25:05 +02:00
|
|
|
static int ext4_writeback_write_end(struct file *file,
|
2009-06-14 23:45:34 +02:00
|
|
|
struct address_space *mapping,
|
|
|
|
loff_t pos, unsigned len, unsigned copied,
|
|
|
|
struct page *page, void *fsdata)
|
2006-10-11 10:20:50 +02:00
|
|
|
{
|
2006-10-11 10:20:53 +02:00
|
|
|
handle_t *handle = ext4_journal_current_handle();
|
2008-07-12 01:27:31 +02:00
|
|
|
struct inode *inode = mapping->host;
|
2006-10-11 10:20:50 +02:00
|
|
|
int ret = 0, ret2;
|
|
|
|
|
2009-06-17 17:48:11 +02:00
|
|
|
trace_ext4_writeback_write_end(inode, pos, len, copied);
|
2009-06-05 06:56:49 +02:00
|
|
|
ret2 = ext4_generic_write_end(file, mapping, pos, len, copied,
|
2007-10-16 10:25:05 +02:00
|
|
|
page, fsdata);
|
2008-04-30 04:01:18 +02:00
|
|
|
copied = ret2;
|
2009-07-13 22:22:22 +02:00
|
|
|
if (pos + len > inode->i_size && ext4_can_truncate(inode))
|
2009-06-05 06:56:49 +02:00
|
|
|
/* if we have allocated more blocks and copied
|
|
|
|
* less. We will have blocks allocated outside
|
|
|
|
* inode->i_size. So truncate them
|
|
|
|
*/
|
|
|
|
ext4_orphan_add(handle, inode);
|
|
|
|
|
2008-04-30 04:01:18 +02:00
|
|
|
if (ret2 < 0)
|
|
|
|
ret = ret2;
|
2006-10-11 10:20:50 +02:00
|
|
|
|
2006-10-11 10:20:53 +02:00
|
|
|
ret2 = ext4_journal_stop(handle);
|
2006-10-11 10:20:50 +02:00
|
|
|
if (!ret)
|
|
|
|
ret = ret2;
|
2007-10-16 10:25:05 +02:00
|
|
|
|
2009-06-05 06:56:49 +02:00
|
|
|
if (pos + len > inode->i_size) {
|
2009-12-09 03:24:33 +01:00
|
|
|
ext4_truncate_failed_write(inode);
|
2009-06-14 23:45:34 +02:00
|
|
|
/*
|
2009-07-13 22:22:22 +02:00
|
|
|
* If truncate failed early the inode might still be
|
2009-06-05 06:56:49 +02:00
|
|
|
* on the orphan list; we need to make sure the inode
|
|
|
|
* is removed from the orphan list in that case.
|
|
|
|
*/
|
|
|
|
if (inode->i_nlink)
|
|
|
|
ext4_orphan_del(NULL, inode);
|
|
|
|
}
|
|
|
|
|
2007-10-16 10:25:05 +02:00
|
|
|
return ret ? ret : copied;
|
2006-10-11 10:20:50 +02:00
|
|
|
}
|
|
|
|
|
2007-10-16 10:25:05 +02:00
|
|
|
static int ext4_journalled_write_end(struct file *file,
|
2009-06-14 23:45:34 +02:00
|
|
|
struct address_space *mapping,
|
|
|
|
loff_t pos, unsigned len, unsigned copied,
|
|
|
|
struct page *page, void *fsdata)
|
2006-10-11 10:20:50 +02:00
|
|
|
{
|
2006-10-11 10:20:53 +02:00
|
|
|
handle_t *handle = ext4_journal_current_handle();
|
2007-10-16 10:25:05 +02:00
|
|
|
struct inode *inode = mapping->host;
|
2006-10-11 10:20:50 +02:00
|
|
|
int ret = 0, ret2;
|
|
|
|
int partial = 0;
|
2007-10-16 10:25:05 +02:00
|
|
|
unsigned from, to;
|
2008-09-13 19:06:18 +02:00
|
|
|
loff_t new_i_size;
|
2006-10-11 10:20:50 +02:00
|
|
|
|
2009-06-17 17:48:11 +02:00
|
|
|
trace_ext4_journalled_write_end(inode, pos, len, copied);
|
2007-10-16 10:25:05 +02:00
|
|
|
from = pos & (PAGE_CACHE_SIZE - 1);
|
|
|
|
to = from + len;
|
|
|
|
|
ext4: Fix ext4_should_writeback_data() for no-journal mode
ext4_should_writeback_data() had an incorrect sequence of
tests to determine if it should return 0 or 1: in
particular, even in no-journal mode, 0 was being returned
for a non-regular-file inode.
This meant that, in non-journal mode, we would use
ext4_journalled_aops for directories, symlinks, and other
non-regular files. However, calling journalled aop
callbacks when there is no valid handle, can cause problems.
This would cause a kernel crash with Jan Kara's commit
2d859db3e4 ("ext4: fix data corruption in inodes with
journalled data"), because we now dereference 'handle' in
ext4_journalled_write_end().
I also added BUG_ONs to check for a valid handle in the
obviously journal-only aops callbacks.
I tested this running xfstests with a scratch device in
these modes:
- no-journal
- data=ordered
- data=writeback
- data=journal
All work fine; the data=journal run has many failures and a
crash in xfstests 074, but this is no different from a
vanilla kernel.
Signed-off-by: Curt Wohlgemuth <curtw@google.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Cc: stable@kernel.org
2011-08-13 17:25:18 +02:00
|
|
|
BUG_ON(!ext4_handle_valid(handle));
|
|
|
|
|
2007-10-16 10:25:05 +02:00
|
|
|
if (copied < len) {
|
|
|
|
if (!PageUptodate(page))
|
|
|
|
copied = 0;
|
|
|
|
page_zero_new_buffers(page, from+copied, to);
|
|
|
|
}
|
2006-10-11 10:20:50 +02:00
|
|
|
|
|
|
|
ret = walk_page_buffers(handle, page_buffers(page), from,
|
2007-10-16 10:25:05 +02:00
|
|
|
to, &partial, write_end_fn);
|
2006-10-11 10:20:50 +02:00
|
|
|
if (!partial)
|
|
|
|
SetPageUptodate(page);
|
2008-09-13 19:06:18 +02:00
|
|
|
new_i_size = pos + copied;
|
|
|
|
if (new_i_size > inode->i_size)
|
2007-10-16 10:25:05 +02:00
|
|
|
i_size_write(inode, pos+copied);
|
2010-01-24 20:34:07 +01:00
|
|
|
ext4_set_inode_state(inode, EXT4_STATE_JDATA);
|
2011-07-26 15:07:11 +02:00
|
|
|
EXT4_I(inode)->i_datasync_tid = handle->h_transaction->t_tid;
|
2008-09-13 19:06:18 +02:00
|
|
|
if (new_i_size > EXT4_I(inode)->i_disksize) {
|
|
|
|
ext4_update_i_disksize(inode, new_i_size);
|
2006-10-11 10:20:53 +02:00
|
|
|
ret2 = ext4_mark_inode_dirty(handle, inode);
|
2006-10-11 10:20:50 +02:00
|
|
|
if (!ret)
|
|
|
|
ret = ret2;
|
|
|
|
}
|
2007-10-16 10:25:05 +02:00
|
|
|
|
2008-07-12 01:27:31 +02:00
|
|
|
unlock_page(page);
|
2009-06-05 06:56:49 +02:00
|
|
|
page_cache_release(page);
|
2009-07-13 22:22:22 +02:00
|
|
|
if (pos + len > inode->i_size && ext4_can_truncate(inode))
|
2009-06-05 06:56:49 +02:00
|
|
|
/* if we have allocated more blocks and copied
|
|
|
|
* less. We will have blocks allocated outside
|
|
|
|
* inode->i_size. So truncate them
|
|
|
|
*/
|
|
|
|
ext4_orphan_add(handle, inode);
|
|
|
|
|
2006-10-11 10:20:53 +02:00
|
|
|
ret2 = ext4_journal_stop(handle);
|
2006-10-11 10:20:50 +02:00
|
|
|
if (!ret)
|
|
|
|
ret = ret2;
|
2009-06-05 06:56:49 +02:00
|
|
|
if (pos + len > inode->i_size) {
|
2009-12-09 03:24:33 +01:00
|
|
|
ext4_truncate_failed_write(inode);
|
2009-06-14 23:45:34 +02:00
|
|
|
/*
|
2009-07-13 22:22:22 +02:00
|
|
|
* If truncate failed early the inode might still be
|
2009-06-05 06:56:49 +02:00
|
|
|
* on the orphan list; we need to make sure the inode
|
|
|
|
* is removed from the orphan list in that case.
|
|
|
|
*/
|
|
|
|
if (inode->i_nlink)
|
|
|
|
ext4_orphan_del(NULL, inode);
|
|
|
|
}
|
2007-10-16 10:25:05 +02:00
|
|
|
|
|
|
|
return ret ? ret : copied;
|
2006-10-11 10:20:50 +02:00
|
|
|
}
|
2008-07-14 23:52:37 +02:00
|
|
|
|
2010-01-01 08:41:30 +01:00
|
|
|
/*
|
2011-09-10 01:04:51 +02:00
|
|
|
* Reserve a single cluster located at lblock
|
2010-01-01 08:41:30 +01:00
|
|
|
*/
|
2011-09-10 01:20:51 +02:00
|
|
|
static int ext4_da_reserve_space(struct inode *inode, ext4_lblk_t lblock)
|
2008-07-14 23:52:37 +02:00
|
|
|
{
|
2008-09-09 05:14:50 +02:00
|
|
|
int retries = 0;
|
2009-01-22 18:13:05 +01:00
|
|
|
struct ext4_sb_info *sbi = EXT4_SB(inode->i_sb);
|
2009-12-30 20:20:45 +01:00
|
|
|
struct ext4_inode_info *ei = EXT4_I(inode);
|
2011-09-10 01:04:51 +02:00
|
|
|
unsigned int md_needed;
|
2010-03-03 15:05:00 +01:00
|
|
|
int ret;
|
2008-07-14 23:52:37 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
* recalculate the amount of metadata blocks to reserve
|
|
|
|
* in order to allocate nrblocks
|
|
|
|
* worse case is one extent per block
|
|
|
|
*/
|
2008-09-09 05:14:50 +02:00
|
|
|
repeat:
|
2009-12-30 20:20:45 +01:00
|
|
|
spin_lock(&ei->i_block_reservation_lock);
|
2011-09-10 01:04:51 +02:00
|
|
|
md_needed = EXT4_NUM_B2C(sbi,
|
|
|
|
ext4_calc_metadata_amount(inode, lblock));
|
2010-01-01 07:00:21 +01:00
|
|
|
trace_ext4_da_reserve_space(inode, md_needed);
|
2009-12-30 20:20:45 +01:00
|
|
|
spin_unlock(&ei->i_block_reservation_lock);
|
2008-07-14 23:52:37 +02:00
|
|
|
|
2009-01-22 18:13:05 +01:00
|
|
|
/*
|
2010-05-16 17:00:00 +02:00
|
|
|
* We will charge metadata quota at writeout time; this saves
|
|
|
|
* us from metadata over-estimation, though we may go over by
|
|
|
|
* a small amount in the end. Here we just reserve for data.
|
2009-01-22 18:13:05 +01:00
|
|
|
*/
|
2011-09-10 01:04:51 +02:00
|
|
|
ret = dquot_reserve_block(inode, EXT4_C2B(sbi, 1));
|
2010-03-03 15:05:00 +01:00
|
|
|
if (ret)
|
|
|
|
return ret;
|
2010-05-16 17:00:00 +02:00
|
|
|
/*
|
|
|
|
* We do still charge estimated metadata to the sb though;
|
|
|
|
* we cannot afford to run out of free blocks.
|
|
|
|
*/
|
2011-09-10 01:14:51 +02:00
|
|
|
if (ext4_claim_free_clusters(sbi, md_needed + 1, 0)) {
|
2011-09-10 01:04:51 +02:00
|
|
|
dquot_release_reservation_block(inode, EXT4_C2B(sbi, 1));
|
2008-09-09 05:14:50 +02:00
|
|
|
if (ext4_should_retry_alloc(inode->i_sb, &retries)) {
|
|
|
|
yield();
|
|
|
|
goto repeat;
|
|
|
|
}
|
2008-07-14 23:52:37 +02:00
|
|
|
return -ENOSPC;
|
|
|
|
}
|
2009-12-30 20:20:45 +01:00
|
|
|
spin_lock(&ei->i_block_reservation_lock);
|
2010-01-01 08:41:30 +01:00
|
|
|
ei->i_reserved_data_blocks++;
|
2009-12-30 20:20:45 +01:00
|
|
|
ei->i_reserved_meta_blocks += md_needed;
|
|
|
|
spin_unlock(&ei->i_block_reservation_lock);
|
2009-12-10 17:36:27 +01:00
|
|
|
|
2008-07-14 23:52:37 +02:00
|
|
|
return 0; /* success */
|
|
|
|
}
|
|
|
|
|
2008-07-17 22:12:08 +02:00
|
|
|
static void ext4_da_release_space(struct inode *inode, int to_free)
|
2008-07-14 23:52:37 +02:00
|
|
|
{
|
|
|
|
struct ext4_sb_info *sbi = EXT4_SB(inode->i_sb);
|
2009-12-30 20:20:45 +01:00
|
|
|
struct ext4_inode_info *ei = EXT4_I(inode);
|
2008-07-14 23:52:37 +02:00
|
|
|
|
2008-08-20 04:16:59 +02:00
|
|
|
if (!to_free)
|
|
|
|
return; /* Nothing to release, exit */
|
|
|
|
|
2008-07-14 23:52:37 +02:00
|
|
|
spin_lock(&EXT4_I(inode)->i_block_reservation_lock);
|
2008-08-20 04:16:59 +02:00
|
|
|
|
2010-05-17 08:00:00 +02:00
|
|
|
trace_ext4_da_release_space(inode, to_free);
|
2009-12-30 20:20:45 +01:00
|
|
|
if (unlikely(to_free > ei->i_reserved_data_blocks)) {
|
2008-08-20 04:16:59 +02:00
|
|
|
/*
|
2009-12-30 20:20:45 +01:00
|
|
|
* if there aren't enough reserved blocks, then the
|
|
|
|
* counter is messed up somewhere. Since this
|
|
|
|
* function is called from invalidate page, it's
|
|
|
|
* harmless to return without any action.
|
2008-08-20 04:16:59 +02:00
|
|
|
*/
|
2009-12-30 20:20:45 +01:00
|
|
|
ext4_msg(inode->i_sb, KERN_NOTICE, "ext4_da_release_space: "
|
|
|
|
"ino %lu, to_free %d with only %d reserved "
|
|
|
|
"data blocks\n", inode->i_ino, to_free,
|
|
|
|
ei->i_reserved_data_blocks);
|
|
|
|
WARN_ON(1);
|
|
|
|
to_free = ei->i_reserved_data_blocks;
|
2008-08-20 04:16:59 +02:00
|
|
|
}
|
2009-12-30 20:20:45 +01:00
|
|
|
ei->i_reserved_data_blocks -= to_free;
|
2008-08-20 04:16:59 +02:00
|
|
|
|
2009-12-30 20:20:45 +01:00
|
|
|
if (ei->i_reserved_data_blocks == 0) {
|
|
|
|
/*
|
|
|
|
* We can release all of the reserved metadata blocks
|
|
|
|
* only when we have written all of the delayed
|
|
|
|
* allocation blocks.
|
2011-09-10 01:04:51 +02:00
|
|
|
* Note that in case of bigalloc, i_reserved_meta_blocks,
|
|
|
|
* i_reserved_data_blocks, etc. refer to number of clusters.
|
2009-12-30 20:20:45 +01:00
|
|
|
*/
|
2011-09-10 00:56:51 +02:00
|
|
|
percpu_counter_sub(&sbi->s_dirtyclusters_counter,
|
2010-05-16 17:00:00 +02:00
|
|
|
ei->i_reserved_meta_blocks);
|
2010-01-01 08:36:15 +01:00
|
|
|
ei->i_reserved_meta_blocks = 0;
|
2010-01-01 08:41:30 +01:00
|
|
|
ei->i_da_metadata_calc_len = 0;
|
2009-12-30 20:20:45 +01:00
|
|
|
}
|
2008-07-14 23:52:37 +02:00
|
|
|
|
2010-05-16 17:00:00 +02:00
|
|
|
/* update fs dirty data blocks counter */
|
2011-09-10 00:56:51 +02:00
|
|
|
percpu_counter_sub(&sbi->s_dirtyclusters_counter, to_free);
|
2008-07-14 23:52:37 +02:00
|
|
|
|
|
|
|
spin_unlock(&EXT4_I(inode)->i_block_reservation_lock);
|
2009-01-22 18:13:05 +01:00
|
|
|
|
2011-09-10 01:04:51 +02:00
|
|
|
dquot_release_reservation_block(inode, EXT4_C2B(sbi, to_free));
|
2008-07-14 23:52:37 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static void ext4_da_page_release_reservation(struct page *page,
|
2009-06-14 23:45:34 +02:00
|
|
|
unsigned long offset)
|
2008-07-14 23:52:37 +02:00
|
|
|
{
|
|
|
|
int to_release = 0;
|
|
|
|
struct buffer_head *head, *bh;
|
|
|
|
unsigned int curr_off = 0;
|
2011-09-10 01:04:51 +02:00
|
|
|
struct inode *inode = page->mapping->host;
|
|
|
|
struct ext4_sb_info *sbi = EXT4_SB(inode->i_sb);
|
|
|
|
int num_clusters;
|
2008-07-14 23:52:37 +02:00
|
|
|
|
|
|
|
head = page_buffers(page);
|
|
|
|
bh = head;
|
|
|
|
do {
|
|
|
|
unsigned int next_off = curr_off + bh->b_size;
|
|
|
|
|
|
|
|
if ((offset <= curr_off) && (buffer_delay(bh))) {
|
|
|
|
to_release++;
|
|
|
|
clear_buffer_delay(bh);
|
2011-09-10 01:20:51 +02:00
|
|
|
clear_buffer_da_mapped(bh);
|
2008-07-14 23:52:37 +02:00
|
|
|
}
|
|
|
|
curr_off = next_off;
|
|
|
|
} while ((bh = bh->b_this_page) != head);
|
2011-09-10 01:04:51 +02:00
|
|
|
|
|
|
|
/* If we have released all the blocks belonging to a cluster, then we
|
|
|
|
* need to release the reserved space for that cluster. */
|
|
|
|
num_clusters = EXT4_NUM_B2C(sbi, to_release);
|
|
|
|
while (num_clusters > 0) {
|
|
|
|
ext4_fsblk_t lblk;
|
|
|
|
lblk = (page->index << (PAGE_CACHE_SHIFT - inode->i_blkbits)) +
|
|
|
|
((num_clusters - 1) << sbi->s_cluster_bits);
|
|
|
|
if (sbi->s_cluster_ratio == 1 ||
|
|
|
|
!ext4_find_delalloc_cluster(inode, lblk, 1))
|
|
|
|
ext4_da_release_space(inode, 1);
|
|
|
|
|
|
|
|
num_clusters--;
|
|
|
|
}
|
2008-07-14 23:52:37 +02:00
|
|
|
}
|
2006-10-11 10:20:50 +02:00
|
|
|
|
2008-07-12 01:27:31 +02:00
|
|
|
/*
|
|
|
|
* Delayed allocation stuff
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*
|
|
|
|
* mpage_da_submit_io - walks through extent of pages and try to write
|
2008-08-20 03:55:02 +02:00
|
|
|
* them with writepage() call back
|
2008-07-12 01:27:31 +02:00
|
|
|
*
|
|
|
|
* @mpd->inode: inode
|
|
|
|
* @mpd->first_page: first page of the extent
|
|
|
|
* @mpd->next_page: page after the last page of the extent
|
|
|
|
*
|
|
|
|
* By the time mpage_da_submit_io() is called we expect all blocks
|
|
|
|
* to be allocated. this may be wrong if allocation failed.
|
|
|
|
*
|
|
|
|
* As pages are already locked by write_cache_pages(), we can't use it
|
|
|
|
*/
|
2010-10-28 03:30:10 +02:00
|
|
|
static int mpage_da_submit_io(struct mpage_da_data *mpd,
|
|
|
|
struct ext4_map_blocks *map)
|
2008-07-12 01:27:31 +02:00
|
|
|
{
|
2009-01-06 03:50:43 +01:00
|
|
|
struct pagevec pvec;
|
|
|
|
unsigned long index, end;
|
|
|
|
int ret = 0, err, nr_pages, i;
|
|
|
|
struct inode *inode = mpd->inode;
|
|
|
|
struct address_space *mapping = inode->i_mapping;
|
2010-10-28 03:30:09 +02:00
|
|
|
loff_t size = i_size_read(inode);
|
2010-10-28 03:30:10 +02:00
|
|
|
unsigned int len, block_start;
|
|
|
|
struct buffer_head *bh, *page_bufs = NULL;
|
2010-10-28 03:30:09 +02:00
|
|
|
int journal_data = ext4_should_journal_data(inode);
|
2010-10-28 03:30:10 +02:00
|
|
|
sector_t pblock = 0, cur_logical = 0;
|
2010-10-28 03:30:10 +02:00
|
|
|
struct ext4_io_submit io_submit;
|
2008-07-12 01:27:31 +02:00
|
|
|
|
|
|
|
BUG_ON(mpd->next_page <= mpd->first_page);
|
2010-10-28 03:30:10 +02:00
|
|
|
memset(&io_submit, 0, sizeof(io_submit));
|
2009-01-06 03:50:43 +01:00
|
|
|
/*
|
|
|
|
* We need to start from the first_page to the next_page - 1
|
|
|
|
* to make sure we also write the mapped dirty buffer_heads.
|
2009-02-23 12:46:01 +01:00
|
|
|
* If we look at mpd->b_blocknr we would only be looking
|
2009-01-06 03:50:43 +01:00
|
|
|
* at the currently mapped buffer_heads.
|
|
|
|
*/
|
2008-07-12 01:27:31 +02:00
|
|
|
index = mpd->first_page;
|
|
|
|
end = mpd->next_page - 1;
|
|
|
|
|
2009-01-06 03:50:43 +01:00
|
|
|
pagevec_init(&pvec, 0);
|
2008-07-12 01:27:31 +02:00
|
|
|
while (index <= end) {
|
2009-01-06 03:50:43 +01:00
|
|
|
nr_pages = pagevec_lookup(&pvec, mapping, index, PAGEVEC_SIZE);
|
2008-07-12 01:27:31 +02:00
|
|
|
if (nr_pages == 0)
|
|
|
|
break;
|
|
|
|
for (i = 0; i < nr_pages; i++) {
|
2011-02-26 20:08:01 +01:00
|
|
|
int commit_write = 0, skip_page = 0;
|
2008-07-12 01:27:31 +02:00
|
|
|
struct page *page = pvec.pages[i];
|
|
|
|
|
2009-01-06 03:50:43 +01:00
|
|
|
index = page->index;
|
|
|
|
if (index > end)
|
|
|
|
break;
|
2010-10-28 03:30:09 +02:00
|
|
|
|
|
|
|
if (index == size >> PAGE_CACHE_SHIFT)
|
|
|
|
len = size & ~PAGE_CACHE_MASK;
|
|
|
|
else
|
|
|
|
len = PAGE_CACHE_SIZE;
|
2010-10-28 03:30:10 +02:00
|
|
|
if (map) {
|
|
|
|
cur_logical = index << (PAGE_CACHE_SHIFT -
|
|
|
|
inode->i_blkbits);
|
|
|
|
pblock = map->m_pblk + (cur_logical -
|
|
|
|
map->m_lblk);
|
|
|
|
}
|
2009-01-06 03:50:43 +01:00
|
|
|
index++;
|
|
|
|
|
|
|
|
BUG_ON(!PageLocked(page));
|
|
|
|
BUG_ON(PageWriteback(page));
|
|
|
|
|
2008-07-12 01:27:31 +02:00
|
|
|
/*
|
2010-10-28 03:30:09 +02:00
|
|
|
* If the page does not have buffers (for
|
|
|
|
* whatever reason), try to create them using
|
2010-10-28 05:44:47 +02:00
|
|
|
* __block_write_begin. If this fails,
|
2011-02-26 20:08:01 +01:00
|
|
|
* skip the page and move on.
|
2008-07-12 01:27:31 +02:00
|
|
|
*/
|
2010-10-28 03:30:09 +02:00
|
|
|
if (!page_has_buffers(page)) {
|
2010-10-28 05:44:47 +02:00
|
|
|
if (__block_write_begin(page, 0, len,
|
2010-10-28 03:30:09 +02:00
|
|
|
noalloc_get_block_write)) {
|
2011-02-26 20:08:01 +01:00
|
|
|
skip_page:
|
2010-10-28 03:30:09 +02:00
|
|
|
unlock_page(page);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
commit_write = 1;
|
|
|
|
}
|
2008-07-12 01:27:31 +02:00
|
|
|
|
2010-10-28 03:30:10 +02:00
|
|
|
bh = page_bufs = page_buffers(page);
|
|
|
|
block_start = 0;
|
2008-07-12 01:27:31 +02:00
|
|
|
do {
|
2010-10-28 03:30:10 +02:00
|
|
|
if (!bh)
|
2011-02-26 20:08:01 +01:00
|
|
|
goto skip_page;
|
2010-10-28 03:30:10 +02:00
|
|
|
if (map && (cur_logical >= map->m_lblk) &&
|
|
|
|
(cur_logical <= (map->m_lblk +
|
|
|
|
(map->m_len - 1)))) {
|
2009-05-12 22:30:27 +02:00
|
|
|
if (buffer_delay(bh)) {
|
|
|
|
clear_buffer_delay(bh);
|
|
|
|
bh->b_blocknr = pblock;
|
|
|
|
}
|
2011-09-10 01:20:51 +02:00
|
|
|
if (buffer_da_mapped(bh))
|
|
|
|
clear_buffer_da_mapped(bh);
|
2010-10-28 03:30:10 +02:00
|
|
|
if (buffer_unwritten(bh) ||
|
|
|
|
buffer_mapped(bh))
|
|
|
|
BUG_ON(bh->b_blocknr != pblock);
|
|
|
|
if (map->m_flags & EXT4_MAP_UNINIT)
|
|
|
|
set_buffer_uninit(bh);
|
|
|
|
clear_buffer_unwritten(bh);
|
|
|
|
}
|
2009-05-12 22:30:27 +02:00
|
|
|
|
2011-02-26 20:08:01 +01:00
|
|
|
/* skip page if block allocation undone */
|
2010-10-28 03:30:10 +02:00
|
|
|
if (buffer_delay(bh) || buffer_unwritten(bh))
|
2011-02-26 20:08:01 +01:00
|
|
|
skip_page = 1;
|
2010-10-28 03:30:10 +02:00
|
|
|
bh = bh->b_this_page;
|
|
|
|
block_start += bh->b_size;
|
2008-07-12 01:27:31 +02:00
|
|
|
cur_logical++;
|
|
|
|
pblock++;
|
2010-10-28 03:30:10 +02:00
|
|
|
} while (bh != page_bufs);
|
|
|
|
|
2011-02-26 20:08:01 +01:00
|
|
|
if (skip_page)
|
|
|
|
goto skip_page;
|
2010-10-28 03:30:09 +02:00
|
|
|
|
|
|
|
if (commit_write)
|
|
|
|
/* mark the buffer_heads as dirty & uptodate */
|
|
|
|
block_commit_write(page, 0, len);
|
|
|
|
|
2011-02-26 20:08:01 +01:00
|
|
|
clear_page_dirty_for_io(page);
|
2010-10-28 03:30:10 +02:00
|
|
|
/*
|
|
|
|
* Delalloc doesn't support data journalling,
|
|
|
|
* but eventually maybe we'll lift this
|
|
|
|
* restriction.
|
|
|
|
*/
|
|
|
|
if (unlikely(journal_data && PageChecked(page)))
|
2010-10-28 03:30:09 +02:00
|
|
|
err = __ext4_journalled_writepage(page, len);
|
ext4: Turn off multiple page-io submission by default
Jon Nelson has found a test case which causes postgresql to fail with
the error:
psql:t.sql:4: ERROR: invalid page header in block 38269 of relation base/16384/16581
Under memory pressure, it looks like part of a file can end up getting
replaced by zero's. Until we can figure out the cause, we'll roll
back the change and use block_write_full_page() instead of
ext4_bio_write_page(). The new, more efficient writing function can
be used via the mount option mblk_io_submit, so we can test and fix
the new page I/O code.
To reproduce the problem, install postgres 8.4 or 9.0, and pin enough
memory such that the system just at the end of triggering writeback
before running the following sql script:
begin;
create temporary table foo as select x as a, ARRAY[x] as b FROM
generate_series(1, 10000000 ) AS x;
create index foo_a_idx on foo (a);
create index foo_b_idx on foo USING GIN (b);
rollback;
If the temporary table is created on a hard drive partition which is
encrypted using dm_crypt, then under memory pressure, approximately
30-40% of the time, pgsql will issue the above failure.
This patch should fix this problem, and the problem will come back if
the file system is mounted with the mblk_io_submit mount option.
Reported-by: Jon Nelson <jnelson@jamponi.net>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2010-12-14 21:27:50 +01:00
|
|
|
else if (test_opt(inode->i_sb, MBLK_IO_SUBMIT))
|
2010-10-28 03:30:10 +02:00
|
|
|
err = ext4_bio_write_page(&io_submit, page,
|
|
|
|
len, mpd->wbc);
|
ext4: fix nomblk_io_submit option so it correctly converts uninit blocks
Bug discovered by Jan Kara:
Finally, commit 1449032be17abb69116dbc393f67ceb8bd034f92 returned back
the old IO submission code but apparently it forgot to return the old
handling of uninitialized buffers so we unconditionnaly call
block_write_full_page() without specifying end_io function. So AFAICS
we never convert unwritten extents to written in some cases. For
example when I mount the fs as: mount -t ext4 -o
nomblk_io_submit,dioread_nolock /dev/ubdb /mnt and do
int fd = open(argv[1], O_RDWR | O_CREAT | O_TRUNC, 0600);
char buf[1024];
memset(buf, 'a', sizeof(buf));
fallocate(fd, 0, 0, 16384);
write(fd, buf, sizeof(buf));
I get a file full of zeros (after remounting the filesystem so that
pagecache is dropped) instead of seeing the first KB contain 'a's.
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Cc: stable@kernel.org
2011-08-13 18:58:21 +02:00
|
|
|
else if (buffer_uninit(page_bufs)) {
|
|
|
|
ext4_set_bh_endio(page_bufs, inode);
|
|
|
|
err = block_write_full_page_endio(page,
|
|
|
|
noalloc_get_block_write,
|
|
|
|
mpd->wbc, ext4_end_io_buffer_write);
|
|
|
|
} else
|
ext4: Turn off multiple page-io submission by default
Jon Nelson has found a test case which causes postgresql to fail with
the error:
psql:t.sql:4: ERROR: invalid page header in block 38269 of relation base/16384/16581
Under memory pressure, it looks like part of a file can end up getting
replaced by zero's. Until we can figure out the cause, we'll roll
back the change and use block_write_full_page() instead of
ext4_bio_write_page(). The new, more efficient writing function can
be used via the mount option mblk_io_submit, so we can test and fix
the new page I/O code.
To reproduce the problem, install postgres 8.4 or 9.0, and pin enough
memory such that the system just at the end of triggering writeback
before running the following sql script:
begin;
create temporary table foo as select x as a, ARRAY[x] as b FROM
generate_series(1, 10000000 ) AS x;
create index foo_a_idx on foo (a);
create index foo_b_idx on foo USING GIN (b);
rollback;
If the temporary table is created on a hard drive partition which is
encrypted using dm_crypt, then under memory pressure, approximately
30-40% of the time, pgsql will issue the above failure.
This patch should fix this problem, and the problem will come back if
the file system is mounted with the mblk_io_submit mount option.
Reported-by: Jon Nelson <jnelson@jamponi.net>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2010-12-14 21:27:50 +01:00
|
|
|
err = block_write_full_page(page,
|
|
|
|
noalloc_get_block_write, mpd->wbc);
|
2010-10-28 03:30:09 +02:00
|
|
|
|
|
|
|
if (!err)
|
2008-08-20 03:55:02 +02:00
|
|
|
mpd->pages_written++;
|
2008-07-12 01:27:31 +02:00
|
|
|
/*
|
|
|
|
* In error case, we have to continue because
|
|
|
|
* remaining pages are still locked
|
|
|
|
*/
|
|
|
|
if (ret == 0)
|
|
|
|
ret = err;
|
|
|
|
}
|
|
|
|
pagevec_release(&pvec);
|
|
|
|
}
|
2010-10-28 03:30:10 +02:00
|
|
|
ext4_io_submit(&io_submit);
|
2008-07-12 01:27:31 +02:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2011-02-26 18:27:52 +01:00
|
|
|
static void ext4_da_block_invalidatepages(struct mpage_da_data *mpd)
|
2008-08-20 03:08:18 +02:00
|
|
|
{
|
|
|
|
int nr_pages, i;
|
|
|
|
pgoff_t index, end;
|
|
|
|
struct pagevec pvec;
|
|
|
|
struct inode *inode = mpd->inode;
|
|
|
|
struct address_space *mapping = inode->i_mapping;
|
|
|
|
|
2011-02-26 18:27:52 +01:00
|
|
|
index = mpd->first_page;
|
|
|
|
end = mpd->next_page - 1;
|
2008-08-20 03:08:18 +02:00
|
|
|
while (index <= end) {
|
|
|
|
nr_pages = pagevec_lookup(&pvec, mapping, index, PAGEVEC_SIZE);
|
|
|
|
if (nr_pages == 0)
|
|
|
|
break;
|
|
|
|
for (i = 0; i < nr_pages; i++) {
|
|
|
|
struct page *page = pvec.pages[i];
|
2010-03-03 22:19:32 +01:00
|
|
|
if (page->index > end)
|
2008-08-20 03:08:18 +02:00
|
|
|
break;
|
|
|
|
BUG_ON(!PageLocked(page));
|
|
|
|
BUG_ON(PageWriteback(page));
|
|
|
|
block_invalidatepage(page, 0);
|
|
|
|
ClearPageUptodate(page);
|
|
|
|
unlock_page(page);
|
|
|
|
}
|
2010-03-03 22:19:32 +01:00
|
|
|
index = pvec.pages[nr_pages - 1]->index + 1;
|
|
|
|
pagevec_release(&pvec);
|
2008-08-20 03:08:18 +02:00
|
|
|
}
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2008-09-09 05:05:34 +02:00
|
|
|
static void ext4_print_free_blocks(struct inode *inode)
|
|
|
|
{
|
|
|
|
struct ext4_sb_info *sbi = EXT4_SB(inode->i_sb);
|
2009-09-26 23:43:59 +02:00
|
|
|
printk(KERN_CRIT "Total free blocks count %lld\n",
|
2011-09-10 01:10:51 +02:00
|
|
|
EXT4_C2B(EXT4_SB(inode->i_sb),
|
|
|
|
ext4_count_free_clusters(inode->i_sb)));
|
2009-09-26 23:43:59 +02:00
|
|
|
printk(KERN_CRIT "Free/Dirty block details\n");
|
|
|
|
printk(KERN_CRIT "free_blocks=%lld\n",
|
2011-09-10 00:56:51 +02:00
|
|
|
(long long) EXT4_C2B(EXT4_SB(inode->i_sb),
|
|
|
|
percpu_counter_sum(&sbi->s_freeclusters_counter)));
|
2009-09-26 23:43:59 +02:00
|
|
|
printk(KERN_CRIT "dirty_blocks=%lld\n",
|
2011-09-10 01:04:51 +02:00
|
|
|
(long long) EXT4_C2B(EXT4_SB(inode->i_sb),
|
|
|
|
percpu_counter_sum(&sbi->s_dirtyclusters_counter)));
|
2009-09-26 23:43:59 +02:00
|
|
|
printk(KERN_CRIT "Block reservation details\n");
|
|
|
|
printk(KERN_CRIT "i_reserved_data_blocks=%u\n",
|
|
|
|
EXT4_I(inode)->i_reserved_data_blocks);
|
|
|
|
printk(KERN_CRIT "i_reserved_meta_blocks=%u\n",
|
|
|
|
EXT4_I(inode)->i_reserved_meta_blocks);
|
2008-09-09 05:05:34 +02:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2008-07-12 01:27:31 +02:00
|
|
|
/*
|
2010-10-28 03:30:09 +02:00
|
|
|
* mpage_da_map_and_submit - go through given space, map them
|
|
|
|
* if necessary, and then submit them for I/O
|
2008-07-12 01:27:31 +02:00
|
|
|
*
|
2009-02-23 12:46:01 +01:00
|
|
|
* @mpd - bh describing space
|
2008-07-12 01:27:31 +02:00
|
|
|
*
|
|
|
|
* The function skips space we know is already mapped to disk blocks.
|
|
|
|
*
|
|
|
|
*/
|
2010-10-28 03:30:09 +02:00
|
|
|
static void mpage_da_map_and_submit(struct mpage_da_data *mpd)
|
2008-07-12 01:27:31 +02:00
|
|
|
{
|
2009-05-14 19:57:08 +02:00
|
|
|
int err, blks, get_blocks_flags;
|
2010-10-28 03:30:10 +02:00
|
|
|
struct ext4_map_blocks map, *mapp = NULL;
|
2009-05-14 15:29:45 +02:00
|
|
|
sector_t next = mpd->b_blocknr;
|
|
|
|
unsigned max_blocks = mpd->b_size >> mpd->inode->i_blkbits;
|
|
|
|
loff_t disksize = EXT4_I(mpd->inode)->i_disksize;
|
|
|
|
handle_t *handle = NULL;
|
2008-07-12 01:27:31 +02:00
|
|
|
|
|
|
|
/*
|
2010-10-28 03:30:09 +02:00
|
|
|
* If the blocks are mapped already, or we couldn't accumulate
|
|
|
|
* any blocks, then proceed immediately to the submission stage.
|
2009-05-14 15:29:45 +02:00
|
|
|
*/
|
2010-10-28 03:30:09 +02:00
|
|
|
if ((mpd->b_size == 0) ||
|
|
|
|
((mpd->b_state & (1 << BH_Mapped)) &&
|
|
|
|
!(mpd->b_state & (1 << BH_Delay)) &&
|
|
|
|
!(mpd->b_state & (1 << BH_Unwritten))))
|
|
|
|
goto submit_io;
|
2009-05-14 15:29:45 +02:00
|
|
|
|
|
|
|
handle = ext4_journal_current_handle();
|
|
|
|
BUG_ON(!handle);
|
|
|
|
|
2009-05-13 21:13:42 +02:00
|
|
|
/*
|
2010-07-27 17:56:07 +02:00
|
|
|
* Call ext4_map_blocks() to allocate any delayed allocation
|
2009-05-14 19:57:08 +02:00
|
|
|
* blocks, or to convert an uninitialized extent to be
|
|
|
|
* initialized (in the case where we have written into
|
|
|
|
* one or more preallocated blocks).
|
|
|
|
*
|
|
|
|
* We pass in the magic EXT4_GET_BLOCKS_DELALLOC_RESERVE to
|
|
|
|
* indicate that we are on the delayed allocation path. This
|
|
|
|
* affects functions in many different parts of the allocation
|
|
|
|
* call path. This flag exists primarily because we don't
|
2010-07-27 17:56:07 +02:00
|
|
|
* want to change *many* call functions, so ext4_map_blocks()
|
2011-01-10 18:12:36 +01:00
|
|
|
* will set the EXT4_STATE_DELALLOC_RESERVED flag once the
|
2009-05-14 19:57:08 +02:00
|
|
|
* inode's allocation semaphore is taken.
|
|
|
|
*
|
|
|
|
* If the blocks in questions were delalloc blocks, set
|
|
|
|
* EXT4_GET_BLOCKS_DELALLOC_RESERVE so the delalloc accounting
|
|
|
|
* variables are updated after the blocks have been allocated.
|
2009-05-13 21:13:42 +02:00
|
|
|
*/
|
2010-05-17 02:00:00 +02:00
|
|
|
map.m_lblk = next;
|
|
|
|
map.m_len = max_blocks;
|
2010-01-15 07:27:59 +01:00
|
|
|
get_blocks_flags = EXT4_GET_BLOCKS_CREATE;
|
2010-03-04 22:14:02 +01:00
|
|
|
if (ext4_should_dioread_nolock(mpd->inode))
|
|
|
|
get_blocks_flags |= EXT4_GET_BLOCKS_IO_CREATE_EXT;
|
2009-05-14 19:57:08 +02:00
|
|
|
if (mpd->b_state & (1 << BH_Delay))
|
2010-01-15 07:27:59 +01:00
|
|
|
get_blocks_flags |= EXT4_GET_BLOCKS_DELALLOC_RESERVE;
|
|
|
|
|
2010-05-17 02:00:00 +02:00
|
|
|
blks = ext4_map_blocks(handle, mpd->inode, &map, get_blocks_flags);
|
2009-05-14 15:29:45 +02:00
|
|
|
if (blks < 0) {
|
2010-07-27 17:56:08 +02:00
|
|
|
struct super_block *sb = mpd->inode->i_sb;
|
|
|
|
|
2009-05-14 15:29:45 +02:00
|
|
|
err = blks;
|
2009-02-23 16:48:07 +01:00
|
|
|
/*
|
2010-10-28 03:30:09 +02:00
|
|
|
* If get block returns EAGAIN or ENOSPC and there
|
2011-02-26 20:08:01 +01:00
|
|
|
* appears to be free blocks we will just let
|
|
|
|
* mpage_da_submit_io() unlock all of the pages.
|
2008-08-20 03:08:18 +02:00
|
|
|
*/
|
|
|
|
if (err == -EAGAIN)
|
2010-10-28 03:30:09 +02:00
|
|
|
goto submit_io;
|
2008-09-09 05:05:34 +02:00
|
|
|
|
2011-09-10 01:10:51 +02:00
|
|
|
if (err == -ENOSPC && ext4_count_free_clusters(sb)) {
|
2008-09-09 05:05:34 +02:00
|
|
|
mpd->retval = err;
|
2010-10-28 03:30:09 +02:00
|
|
|
goto submit_io;
|
2008-09-09 05:05:34 +02:00
|
|
|
}
|
|
|
|
|
2008-08-20 03:08:18 +02:00
|
|
|
/*
|
2009-02-23 16:48:07 +01:00
|
|
|
* get block failure will cause us to loop in
|
|
|
|
* writepages, because a_ops->writepage won't be able
|
|
|
|
* to make progress. The page will be redirtied by
|
|
|
|
* writepage and writepages will again try to write
|
|
|
|
* the same.
|
2008-08-20 03:08:18 +02:00
|
|
|
*/
|
2010-07-27 17:56:08 +02:00
|
|
|
if (!(EXT4_SB(sb)->s_mount_flags & EXT4_MF_FS_ABORTED)) {
|
|
|
|
ext4_msg(sb, KERN_CRIT,
|
|
|
|
"delayed block allocation failed for inode %lu "
|
|
|
|
"at logical offset %llu with max blocks %zd "
|
|
|
|
"with error %d", mpd->inode->i_ino,
|
|
|
|
(unsigned long long) next,
|
|
|
|
mpd->b_size >> mpd->inode->i_blkbits, err);
|
|
|
|
ext4_msg(sb, KERN_CRIT,
|
|
|
|
"This should not happen!! Data will be lost\n");
|
|
|
|
if (err == -ENOSPC)
|
|
|
|
ext4_print_free_blocks(mpd->inode);
|
2008-09-09 05:14:50 +02:00
|
|
|
}
|
2009-05-14 15:29:45 +02:00
|
|
|
/* invalidate all the pages */
|
2011-02-26 18:27:52 +01:00
|
|
|
ext4_da_block_invalidatepages(mpd);
|
2011-02-26 18:25:52 +01:00
|
|
|
|
|
|
|
/* Mark this page range as having been completed */
|
|
|
|
mpd->io_done = 1;
|
2010-10-28 03:30:09 +02:00
|
|
|
return;
|
2008-08-20 03:08:18 +02:00
|
|
|
}
|
2009-05-14 15:29:45 +02:00
|
|
|
BUG_ON(blks == 0);
|
|
|
|
|
2010-10-28 03:30:10 +02:00
|
|
|
mapp = ↦
|
2010-05-17 02:00:00 +02:00
|
|
|
if (map.m_flags & EXT4_MAP_NEW) {
|
|
|
|
struct block_device *bdev = mpd->inode->i_sb->s_bdev;
|
|
|
|
int i;
|
2008-07-12 01:27:31 +02:00
|
|
|
|
2010-05-17 02:00:00 +02:00
|
|
|
for (i = 0; i < map.m_len; i++)
|
|
|
|
unmap_underlying_metadata(bdev, map.m_pblk + i);
|
2008-07-12 01:27:31 +02:00
|
|
|
|
ext4: only call ext4_jbd2_file_inode when an inode has been extended
In delayed allocation mode, it's important to only call
ext4_jbd2_file_inode when the file has been extended. This is
necessary to avoid a race which first got introduced in commit
678aaf481, but which was made much more common with the introduction
of the "punch hole" functionality. (Especially when dioread_nolock
was enabled; when I could reliably reproduce this problem with
xfstests #74.)
The race is this: If while trying to writeback a delayed allocation
inode, there is a need to map delalloc blocks, and we run out of space
in the journal, *and* at the same time the inode is already on the
committing transaction's t_inode_list (because for example while doing
the punch hole operation, ext4_jbd2_file_inode() is called), then the
commit operation will wait for the inode to finish all of its pending
writebacks by calling filemap_fdatawait(), but since that inode has
one or more pages with the PageWriteback flag set, the commit
operation will wait forever, and the so the writeback of the inode can
never take place, and the kjournald thread and the writeback thread
end up waiting for each other --- forever.
It's important at this point to recall why an inode is placed on the
t_inode_list; it is to provide the data=ordered guarantees that we
don't end up exposing stale data. In the case where we are truncating
or punching a hole in the inode, there is no possibility that stale
data could be exposed in the first place, so we don't need to put the
inode on the t_inode_list!
The right long-term fix is to get rid of data=ordered mode altogether,
and only update the extent tree or indirect blocks after the data has
been written. Until then, this change will also avoid some
unnecessary waiting in the commit operation.
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Cc: Allison Henderson <achender@linux.vnet.ibm.com>
Cc: Jan Kara <jack@suse.cz>
2011-09-06 08:37:06 +02:00
|
|
|
if (ext4_should_order_data(mpd->inode)) {
|
|
|
|
err = ext4_jbd2_file_inode(handle, mpd->inode);
|
|
|
|
if (err)
|
|
|
|
/* Only if the journal is aborted */
|
|
|
|
return;
|
|
|
|
}
|
2009-05-14 15:29:45 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
2009-06-09 06:17:05 +02:00
|
|
|
* Update on-disk size along with block allocation.
|
2009-05-14 15:29:45 +02:00
|
|
|
*/
|
|
|
|
disksize = ((loff_t) next + blks) << mpd->inode->i_blkbits;
|
|
|
|
if (disksize > i_size_read(mpd->inode))
|
|
|
|
disksize = i_size_read(mpd->inode);
|
|
|
|
if (disksize > EXT4_I(mpd->inode)->i_disksize) {
|
|
|
|
ext4_update_i_disksize(mpd->inode, disksize);
|
2010-10-28 03:30:09 +02:00
|
|
|
err = ext4_mark_inode_dirty(handle, mpd->inode);
|
|
|
|
if (err)
|
|
|
|
ext4_error(mpd->inode->i_sb,
|
|
|
|
"Failed to mark inode %lu dirty",
|
|
|
|
mpd->inode->i_ino);
|
2009-05-14 15:29:45 +02:00
|
|
|
}
|
|
|
|
|
2010-10-28 03:30:09 +02:00
|
|
|
submit_io:
|
2010-10-28 03:30:10 +02:00
|
|
|
mpage_da_submit_io(mpd, mapp);
|
2010-10-28 03:30:09 +02:00
|
|
|
mpd->io_done = 1;
|
2008-07-12 01:27:31 +02:00
|
|
|
}
|
|
|
|
|
2008-08-20 04:16:43 +02:00
|
|
|
#define BH_FLAGS ((1 << BH_Uptodate) | (1 << BH_Mapped) | \
|
|
|
|
(1 << BH_Delay) | (1 << BH_Unwritten))
|
2008-07-12 01:27:31 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
* mpage_add_bh_to_extent - try to add one more block to extent of blocks
|
|
|
|
*
|
|
|
|
* @mpd->lbh - extent of blocks
|
|
|
|
* @logical - logical number of the block in the file
|
|
|
|
* @bh - bh of the block (used to access block's state)
|
|
|
|
*
|
|
|
|
* the function is used to collect contig. blocks in same state
|
|
|
|
*/
|
|
|
|
static void mpage_add_bh_to_extent(struct mpage_da_data *mpd,
|
2009-02-23 12:46:01 +01:00
|
|
|
sector_t logical, size_t b_size,
|
|
|
|
unsigned long b_state)
|
2008-07-12 01:27:31 +02:00
|
|
|
{
|
|
|
|
sector_t next;
|
2009-02-23 12:46:01 +01:00
|
|
|
int nrblocks = mpd->b_size >> mpd->inode->i_blkbits;
|
2008-07-12 01:27:31 +02:00
|
|
|
|
ext4: don't scan/accumulate more pages than mballoc will allocate
There was a bug reported on RHEL5 that a 10G dd on a 12G box
had a very, very slow sync after that.
At issue was the loop in write_cache_pages scanning all the way
to the end of the 10G file, even though the subsequent call
to mpage_da_submit_io would only actually write a smallish amt; then
we went back to the write_cache_pages loop ... wasting tons of time
in calling __mpage_da_writepage for thousands of pages we would
just revisit (many times) later.
Upstream it's not such a big issue for sys_sync because we get
to the loop with a much smaller nr_to_write, which limits the loop.
However, talking with Aneesh he realized that fsync upstream still
gets here with a very large nr_to_write and we face the same problem.
This patch makes mpage_add_bh_to_extent stop the loop after we've
accumulated 2048 pages, by setting mpd->io_done = 1; which ultimately
causes the write_cache_pages loop to break.
Repeating the test with a dirty_ratio of 80 (to leave something for
fsync to do), I don't see huge IO performance gains, but the reduction
in cpu usage is striking: 80% usage with stock, and 2% with the
below patch. Instrumenting the loop in write_cache_pages clearly
shows that we are wasting time here.
Eventually we need to change mpage_da_map_pages() also submit its I/O
to the block layer, subsuming mpage_da_submit_io(), and then change it
call ext4_get_blocks() multiple times.
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2010-05-16 10:00:00 +02:00
|
|
|
/*
|
|
|
|
* XXX Don't go larger than mballoc is willing to allocate
|
|
|
|
* This is a stopgap solution. We eventually need to fold
|
|
|
|
* mpage_da_submit_io() into this function and then call
|
2010-07-27 17:56:07 +02:00
|
|
|
* ext4_map_blocks() multiple times in a loop
|
ext4: don't scan/accumulate more pages than mballoc will allocate
There was a bug reported on RHEL5 that a 10G dd on a 12G box
had a very, very slow sync after that.
At issue was the loop in write_cache_pages scanning all the way
to the end of the 10G file, even though the subsequent call
to mpage_da_submit_io would only actually write a smallish amt; then
we went back to the write_cache_pages loop ... wasting tons of time
in calling __mpage_da_writepage for thousands of pages we would
just revisit (many times) later.
Upstream it's not such a big issue for sys_sync because we get
to the loop with a much smaller nr_to_write, which limits the loop.
However, talking with Aneesh he realized that fsync upstream still
gets here with a very large nr_to_write and we face the same problem.
This patch makes mpage_add_bh_to_extent stop the loop after we've
accumulated 2048 pages, by setting mpd->io_done = 1; which ultimately
causes the write_cache_pages loop to break.
Repeating the test with a dirty_ratio of 80 (to leave something for
fsync to do), I don't see huge IO performance gains, but the reduction
in cpu usage is striking: 80% usage with stock, and 2% with the
below patch. Instrumenting the loop in write_cache_pages clearly
shows that we are wasting time here.
Eventually we need to change mpage_da_map_pages() also submit its I/O
to the block layer, subsuming mpage_da_submit_io(), and then change it
call ext4_get_blocks() multiple times.
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2010-05-16 10:00:00 +02:00
|
|
|
*/
|
|
|
|
if (nrblocks >= 8*1024*1024/mpd->inode->i_sb->s_blocksize)
|
|
|
|
goto flush_it;
|
|
|
|
|
2008-08-20 04:15:58 +02:00
|
|
|
/* check if thereserved journal credits might overflow */
|
2010-05-17 04:00:00 +02:00
|
|
|
if (!(ext4_test_inode_flag(mpd->inode, EXT4_INODE_EXTENTS))) {
|
2008-08-20 04:15:58 +02:00
|
|
|
if (nrblocks >= EXT4_MAX_TRANS_DATA) {
|
|
|
|
/*
|
|
|
|
* With non-extent format we are limited by the journal
|
|
|
|
* credit available. Total credit needed to insert
|
|
|
|
* nrblocks contiguous blocks is dependent on the
|
|
|
|
* nrblocks. So limit nrblocks.
|
|
|
|
*/
|
|
|
|
goto flush_it;
|
|
|
|
} else if ((nrblocks + (b_size >> mpd->inode->i_blkbits)) >
|
|
|
|
EXT4_MAX_TRANS_DATA) {
|
|
|
|
/*
|
|
|
|
* Adding the new buffer_head would make it cross the
|
|
|
|
* allowed limit for which we have journal credit
|
|
|
|
* reserved. So limit the new bh->b_size
|
|
|
|
*/
|
|
|
|
b_size = (EXT4_MAX_TRANS_DATA - nrblocks) <<
|
|
|
|
mpd->inode->i_blkbits;
|
|
|
|
/* we will do mpage_da_submit_io in the next loop */
|
|
|
|
}
|
|
|
|
}
|
2008-07-12 01:27:31 +02:00
|
|
|
/*
|
|
|
|
* First block in the extent
|
|
|
|
*/
|
2009-02-23 12:46:01 +01:00
|
|
|
if (mpd->b_size == 0) {
|
|
|
|
mpd->b_blocknr = logical;
|
|
|
|
mpd->b_size = b_size;
|
|
|
|
mpd->b_state = b_state & BH_FLAGS;
|
2008-07-12 01:27:31 +02:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2009-02-23 12:46:01 +01:00
|
|
|
next = mpd->b_blocknr + nrblocks;
|
2008-07-12 01:27:31 +02:00
|
|
|
/*
|
|
|
|
* Can we merge the block to our big extent?
|
|
|
|
*/
|
2009-02-23 12:46:01 +01:00
|
|
|
if (logical == next && (b_state & BH_FLAGS) == mpd->b_state) {
|
|
|
|
mpd->b_size += b_size;
|
2008-07-12 01:27:31 +02:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2008-08-20 04:15:58 +02:00
|
|
|
flush_it:
|
2008-07-12 01:27:31 +02:00
|
|
|
/*
|
|
|
|
* We couldn't merge the block to our extent, so we
|
|
|
|
* need to flush current extent and start new one
|
|
|
|
*/
|
2010-10-28 03:30:09 +02:00
|
|
|
mpage_da_map_and_submit(mpd);
|
2008-08-20 03:55:02 +02:00
|
|
|
return;
|
2008-07-12 01:27:31 +02:00
|
|
|
}
|
|
|
|
|
2009-06-14 23:57:10 +02:00
|
|
|
static int ext4_bh_delay_or_unwritten(handle_t *handle, struct buffer_head *bh)
|
2009-05-12 22:30:27 +02:00
|
|
|
{
|
2009-06-14 23:57:10 +02:00
|
|
|
return (buffer_delay(bh) || buffer_unwritten(bh)) && buffer_dirty(bh);
|
2009-05-12 22:30:27 +02:00
|
|
|
}
|
|
|
|
|
2011-09-10 01:20:51 +02:00
|
|
|
/*
|
|
|
|
* This function is grabs code from the very beginning of
|
|
|
|
* ext4_map_blocks, but assumes that the caller is from delayed write
|
|
|
|
* time. This function looks up the requested blocks and sets the
|
|
|
|
* buffer delay bit under the protection of i_data_sem.
|
|
|
|
*/
|
|
|
|
static int ext4_da_map_blocks(struct inode *inode, sector_t iblock,
|
|
|
|
struct ext4_map_blocks *map,
|
|
|
|
struct buffer_head *bh)
|
|
|
|
{
|
|
|
|
int retval;
|
|
|
|
sector_t invalid_block = ~((sector_t) 0xffff);
|
|
|
|
|
|
|
|
if (invalid_block < ext4_blocks_count(EXT4_SB(inode->i_sb)->s_es))
|
|
|
|
invalid_block = ~0;
|
|
|
|
|
|
|
|
map->m_flags = 0;
|
|
|
|
ext_debug("ext4_da_map_blocks(): inode %lu, max_blocks %u,"
|
|
|
|
"logical block %lu\n", inode->i_ino, map->m_len,
|
|
|
|
(unsigned long) map->m_lblk);
|
|
|
|
/*
|
|
|
|
* Try to see if we can get the block without requesting a new
|
|
|
|
* file system block.
|
|
|
|
*/
|
|
|
|
down_read((&EXT4_I(inode)->i_data_sem));
|
|
|
|
if (ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS))
|
|
|
|
retval = ext4_ext_map_blocks(NULL, inode, map, 0);
|
|
|
|
else
|
|
|
|
retval = ext4_ind_map_blocks(NULL, inode, map, 0);
|
|
|
|
|
|
|
|
if (retval == 0) {
|
|
|
|
/*
|
|
|
|
* XXX: __block_prepare_write() unmaps passed block,
|
|
|
|
* is it OK?
|
|
|
|
*/
|
|
|
|
/* If the block was allocated from previously allocated cluster,
|
|
|
|
* then we dont need to reserve it again. */
|
|
|
|
if (!(map->m_flags & EXT4_MAP_FROM_CLUSTER)) {
|
|
|
|
retval = ext4_da_reserve_space(inode, iblock);
|
|
|
|
if (retval)
|
|
|
|
/* not enough space to reserve */
|
|
|
|
goto out_unlock;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Clear EXT4_MAP_FROM_CLUSTER flag since its purpose is served
|
|
|
|
* and it should not appear on the bh->b_state.
|
|
|
|
*/
|
|
|
|
map->m_flags &= ~EXT4_MAP_FROM_CLUSTER;
|
|
|
|
|
|
|
|
map_bh(bh, inode->i_sb, invalid_block);
|
|
|
|
set_buffer_new(bh);
|
|
|
|
set_buffer_delay(bh);
|
|
|
|
}
|
|
|
|
|
|
|
|
out_unlock:
|
|
|
|
up_read((&EXT4_I(inode)->i_data_sem));
|
|
|
|
|
|
|
|
return retval;
|
|
|
|
}
|
|
|
|
|
2008-07-12 01:27:31 +02:00
|
|
|
/*
|
2009-05-14 06:54:29 +02:00
|
|
|
* This is a special get_blocks_t callback which is used by
|
|
|
|
* ext4_da_write_begin(). It will either return mapped block or
|
|
|
|
* reserve space for a single block.
|
2009-05-12 22:30:27 +02:00
|
|
|
*
|
|
|
|
* For delayed buffer_head we have BH_Mapped, BH_New, BH_Delay set.
|
|
|
|
* We also have b_blocknr = -1 and b_bdev initialized properly
|
|
|
|
*
|
|
|
|
* For unwritten buffer_head we have BH_Mapped, BH_New, BH_Unwritten set.
|
|
|
|
* We also have b_blocknr = physicalblock mapping unwritten extent and b_bdev
|
|
|
|
* initialized properly.
|
2008-07-12 01:27:31 +02:00
|
|
|
*/
|
|
|
|
static int ext4_da_get_block_prep(struct inode *inode, sector_t iblock,
|
2010-05-17 02:00:00 +02:00
|
|
|
struct buffer_head *bh, int create)
|
2008-07-12 01:27:31 +02:00
|
|
|
{
|
2010-05-17 02:00:00 +02:00
|
|
|
struct ext4_map_blocks map;
|
2008-07-12 01:27:31 +02:00
|
|
|
int ret = 0;
|
|
|
|
|
|
|
|
BUG_ON(create == 0);
|
2010-05-17 02:00:00 +02:00
|
|
|
BUG_ON(bh->b_size != inode->i_sb->s_blocksize);
|
|
|
|
|
|
|
|
map.m_lblk = iblock;
|
|
|
|
map.m_len = 1;
|
2008-07-12 01:27:31 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
* first, we need to know whether the block is allocated already
|
|
|
|
* preallocated blocks are unmapped but should treated
|
|
|
|
* the same as allocated blocks.
|
|
|
|
*/
|
2011-09-10 01:20:51 +02:00
|
|
|
ret = ext4_da_map_blocks(inode, iblock, &map, bh);
|
|
|
|
if (ret <= 0)
|
2010-05-17 02:00:00 +02:00
|
|
|
return ret;
|
2008-07-12 01:27:31 +02:00
|
|
|
|
2010-05-17 02:00:00 +02:00
|
|
|
map_bh(bh, inode->i_sb, map.m_pblk);
|
|
|
|
bh->b_state = (bh->b_state & ~EXT4_MAP_FLAGS) | map.m_flags;
|
|
|
|
|
|
|
|
if (buffer_unwritten(bh)) {
|
|
|
|
/* A delayed write to unwritten bh should be marked
|
|
|
|
* new and mapped. Mapped ensures that we don't do
|
|
|
|
* get_block multiple times when we write to the same
|
|
|
|
* offset and new ensures that we do proper zero out
|
|
|
|
* for partial write.
|
|
|
|
*/
|
|
|
|
set_buffer_new(bh);
|
2011-04-11 04:30:07 +02:00
|
|
|
set_buffer_mapped(bh);
|
2010-05-17 02:00:00 +02:00
|
|
|
}
|
|
|
|
return 0;
|
2008-07-12 01:27:31 +02:00
|
|
|
}
|
2008-07-12 01:27:31 +02:00
|
|
|
|
2009-05-14 06:54:29 +02:00
|
|
|
/*
|
|
|
|
* This function is used as a standard get_block_t calback function
|
|
|
|
* when there is no desire to allocate any blocks. It is used as a
|
2010-10-06 10:47:23 +02:00
|
|
|
* callback function for block_write_begin() and block_write_full_page().
|
2010-06-14 20:42:49 +02:00
|
|
|
* These functions should only try to map a single block at a time.
|
2009-05-14 06:54:29 +02:00
|
|
|
*
|
|
|
|
* Since this function doesn't do block allocations even if the caller
|
|
|
|
* requests it by passing in create=1, it is critically important that
|
|
|
|
* any caller checks to make sure that any buffer heads are returned
|
|
|
|
* by this function are either all already mapped or marked for
|
2010-06-14 20:42:49 +02:00
|
|
|
* delayed allocation before calling block_write_full_page(). Otherwise,
|
|
|
|
* b_blocknr could be left unitialized, and the page write functions will
|
|
|
|
* be taken by surprise.
|
2009-05-14 06:54:29 +02:00
|
|
|
*/
|
|
|
|
static int noalloc_get_block_write(struct inode *inode, sector_t iblock,
|
2008-07-12 01:27:31 +02:00
|
|
|
struct buffer_head *bh_result, int create)
|
|
|
|
{
|
2009-05-12 19:51:29 +02:00
|
|
|
BUG_ON(bh_result->b_size != inode->i_sb->s_blocksize);
|
2010-05-17 02:00:00 +02:00
|
|
|
return _ext4_get_block(inode, iblock, bh_result, 0);
|
2008-07-12 01:27:31 +02:00
|
|
|
}
|
|
|
|
|
2009-06-14 23:59:34 +02:00
|
|
|
static int bget_one(handle_t *handle, struct buffer_head *bh)
|
|
|
|
{
|
|
|
|
get_bh(bh);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int bput_one(handle_t *handle, struct buffer_head *bh)
|
|
|
|
{
|
|
|
|
put_bh(bh);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int __ext4_journalled_writepage(struct page *page,
|
|
|
|
unsigned int len)
|
|
|
|
{
|
|
|
|
struct address_space *mapping = page->mapping;
|
|
|
|
struct inode *inode = mapping->host;
|
|
|
|
struct buffer_head *page_bufs;
|
|
|
|
handle_t *handle = NULL;
|
|
|
|
int ret = 0;
|
|
|
|
int err;
|
|
|
|
|
2010-10-28 03:30:09 +02:00
|
|
|
ClearPageChecked(page);
|
2009-06-14 23:59:34 +02:00
|
|
|
page_bufs = page_buffers(page);
|
|
|
|
BUG_ON(!page_bufs);
|
|
|
|
walk_page_buffers(handle, page_bufs, 0, len, NULL, bget_one);
|
|
|
|
/* As soon as we unlock the page, it can go away, but we have
|
|
|
|
* references to buffers so we are safe */
|
|
|
|
unlock_page(page);
|
|
|
|
|
|
|
|
handle = ext4_journal_start(inode, ext4_writepage_trans_blocks(inode));
|
|
|
|
if (IS_ERR(handle)) {
|
|
|
|
ret = PTR_ERR(handle);
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
ext4: Fix ext4_should_writeback_data() for no-journal mode
ext4_should_writeback_data() had an incorrect sequence of
tests to determine if it should return 0 or 1: in
particular, even in no-journal mode, 0 was being returned
for a non-regular-file inode.
This meant that, in non-journal mode, we would use
ext4_journalled_aops for directories, symlinks, and other
non-regular files. However, calling journalled aop
callbacks when there is no valid handle, can cause problems.
This would cause a kernel crash with Jan Kara's commit
2d859db3e4 ("ext4: fix data corruption in inodes with
journalled data"), because we now dereference 'handle' in
ext4_journalled_write_end().
I also added BUG_ONs to check for a valid handle in the
obviously journal-only aops callbacks.
I tested this running xfstests with a scratch device in
these modes:
- no-journal
- data=ordered
- data=writeback
- data=journal
All work fine; the data=journal run has many failures and a
crash in xfstests 074, but this is no different from a
vanilla kernel.
Signed-off-by: Curt Wohlgemuth <curtw@google.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Cc: stable@kernel.org
2011-08-13 17:25:18 +02:00
|
|
|
BUG_ON(!ext4_handle_valid(handle));
|
|
|
|
|
2009-06-14 23:59:34 +02:00
|
|
|
ret = walk_page_buffers(handle, page_bufs, 0, len, NULL,
|
|
|
|
do_journal_get_write_access);
|
|
|
|
|
|
|
|
err = walk_page_buffers(handle, page_bufs, 0, len, NULL,
|
|
|
|
write_end_fn);
|
|
|
|
if (ret == 0)
|
|
|
|
ret = err;
|
2011-07-26 15:07:11 +02:00
|
|
|
EXT4_I(inode)->i_datasync_tid = handle->h_transaction->t_tid;
|
2009-06-14 23:59:34 +02:00
|
|
|
err = ext4_journal_stop(handle);
|
|
|
|
if (!ret)
|
|
|
|
ret = err;
|
|
|
|
|
|
|
|
walk_page_buffers(handle, page_bufs, 0, len, NULL, bput_one);
|
2010-01-24 20:34:07 +01:00
|
|
|
ext4_set_inode_state(inode, EXT4_STATE_JDATA);
|
2009-06-14 23:59:34 +02:00
|
|
|
out:
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2010-03-04 22:14:02 +01:00
|
|
|
static int ext4_set_bh_endio(struct buffer_head *bh, struct inode *inode);
|
|
|
|
static void ext4_end_io_buffer_write(struct buffer_head *bh, int uptodate);
|
|
|
|
|
2008-07-12 01:27:31 +02:00
|
|
|
/*
|
2009-06-14 23:58:45 +02:00
|
|
|
* Note that we don't need to start a transaction unless we're journaling data
|
|
|
|
* because we should have holes filled from ext4_page_mkwrite(). We even don't
|
|
|
|
* need to file the inode to the transaction's list in ordered mode because if
|
|
|
|
* we are writing back data added by write(), the inode is already there and if
|
2011-03-31 03:57:33 +02:00
|
|
|
* we are writing back data modified via mmap(), no one guarantees in which
|
2009-06-14 23:58:45 +02:00
|
|
|
* transaction the data will hit the disk. In case we are journaling data, we
|
|
|
|
* cannot start transaction directly because transaction start ranks above page
|
|
|
|
* lock so we have to do some magic.
|
|
|
|
*
|
2009-05-14 06:54:29 +02:00
|
|
|
* This function can get called via...
|
|
|
|
* - ext4_da_writepages after taking page lock (have journal handle)
|
|
|
|
* - journal_submit_inode_data_buffers (no journal handle)
|
|
|
|
* - shrink_page_list via pdflush (no journal handle)
|
|
|
|
* - grab_page_cache when doing write_begin (have journal handle)
|
2009-06-14 23:58:45 +02:00
|
|
|
*
|
|
|
|
* We don't do any block allocation in this function. If we have page with
|
|
|
|
* multiple blocks we need to write those buffer_heads that are mapped. This
|
|
|
|
* is important for mmaped based write. So if we do with blocksize 1K
|
|
|
|
* truncate(f, 1024);
|
|
|
|
* a = mmap(f, 0, 4096);
|
|
|
|
* a[0] = 'a';
|
|
|
|
* truncate(f, 4096);
|
|
|
|
* we have in the page first buffer_head mapped via page_mkwrite call back
|
|
|
|
* but other bufer_heads would be unmapped but dirty(dirty done via the
|
|
|
|
* do_wp_page). So writepage should write the first block. If we modify
|
|
|
|
* the mmap area beyond 1024 we will again get a page_fault and the
|
|
|
|
* page_mkwrite callback will do the block allocation and mark the
|
|
|
|
* buffer_heads mapped.
|
|
|
|
*
|
|
|
|
* We redirty the page if we have any buffer_heads that is either delay or
|
|
|
|
* unwritten in the page.
|
|
|
|
*
|
|
|
|
* We can get recursively called as show below.
|
|
|
|
*
|
|
|
|
* ext4_writepage() -> kmalloc() -> __alloc_pages() -> page_launder() ->
|
|
|
|
* ext4_writepage()
|
|
|
|
*
|
|
|
|
* But since we don't do any block allocation we should not deadlock.
|
|
|
|
* Page also have the dirty flag cleared so we don't get recurive page_lock.
|
2008-07-12 01:27:31 +02:00
|
|
|
*/
|
2009-06-14 23:58:45 +02:00
|
|
|
static int ext4_writepage(struct page *page,
|
2009-06-14 23:59:34 +02:00
|
|
|
struct writeback_control *wbc)
|
2008-07-12 01:27:31 +02:00
|
|
|
{
|
2010-10-28 03:30:09 +02:00
|
|
|
int ret = 0, commit_write = 0;
|
2008-07-12 01:27:31 +02:00
|
|
|
loff_t size;
|
2008-11-05 06:14:04 +01:00
|
|
|
unsigned int len;
|
2010-03-04 22:14:02 +01:00
|
|
|
struct buffer_head *page_bufs = NULL;
|
2008-07-12 01:27:31 +02:00
|
|
|
struct inode *inode = page->mapping->host;
|
|
|
|
|
2011-06-06 15:51:52 +02:00
|
|
|
trace_ext4_writepage(page);
|
2008-07-12 01:27:31 +02:00
|
|
|
size = i_size_read(inode);
|
|
|
|
if (page->index == size >> PAGE_CACHE_SHIFT)
|
|
|
|
len = size & ~PAGE_CACHE_MASK;
|
|
|
|
else
|
|
|
|
len = PAGE_CACHE_SIZE;
|
2008-07-12 01:27:31 +02:00
|
|
|
|
2010-10-28 03:30:09 +02:00
|
|
|
/*
|
|
|
|
* If the page does not have buffers (for whatever reason),
|
2010-10-28 05:44:47 +02:00
|
|
|
* try to create them using __block_write_begin. If this
|
2010-10-28 03:30:09 +02:00
|
|
|
* fails, redirty the page and move on.
|
|
|
|
*/
|
2010-10-28 23:33:57 +02:00
|
|
|
if (!page_has_buffers(page)) {
|
2010-10-28 05:44:47 +02:00
|
|
|
if (__block_write_begin(page, 0, len,
|
2010-10-28 03:30:09 +02:00
|
|
|
noalloc_get_block_write)) {
|
|
|
|
redirty_page:
|
2008-07-12 01:27:31 +02:00
|
|
|
redirty_page_for_writepage(wbc, page);
|
|
|
|
unlock_page(page);
|
|
|
|
return 0;
|
|
|
|
}
|
2010-10-28 03:30:09 +02:00
|
|
|
commit_write = 1;
|
|
|
|
}
|
|
|
|
page_bufs = page_buffers(page);
|
|
|
|
if (walk_page_buffers(NULL, page_bufs, 0, len, NULL,
|
|
|
|
ext4_bh_delay_or_unwritten)) {
|
2008-07-12 01:27:31 +02:00
|
|
|
/*
|
2010-10-28 23:33:57 +02:00
|
|
|
* We don't want to do block allocation, so redirty
|
|
|
|
* the page and return. We may reach here when we do
|
|
|
|
* a journal commit via journal_submit_inode_data_buffers.
|
|
|
|
* We can also reach here via shrink_page_list
|
2008-07-12 01:27:31 +02:00
|
|
|
*/
|
2010-10-28 03:30:09 +02:00
|
|
|
goto redirty_page;
|
|
|
|
}
|
|
|
|
if (commit_write)
|
2008-11-07 15:06:45 +01:00
|
|
|
/* now mark the buffer_heads as dirty and uptodate */
|
2009-06-04 14:06:06 +02:00
|
|
|
block_commit_write(page, 0, len);
|
2008-07-12 01:27:31 +02:00
|
|
|
|
2010-10-28 03:30:09 +02:00
|
|
|
if (PageChecked(page) && ext4_should_journal_data(inode))
|
2009-06-14 23:58:45 +02:00
|
|
|
/*
|
|
|
|
* It's mmapped pagecache. Add buffers and journal it. There
|
|
|
|
* doesn't seem much point in redirtying the page here.
|
|
|
|
*/
|
2009-11-24 17:15:44 +01:00
|
|
|
return __ext4_journalled_writepage(page, len);
|
2009-06-14 23:58:45 +02:00
|
|
|
|
2010-10-28 03:30:09 +02:00
|
|
|
if (buffer_uninit(page_bufs)) {
|
2010-03-04 22:14:02 +01:00
|
|
|
ext4_set_bh_endio(page_bufs, inode);
|
|
|
|
ret = block_write_full_page_endio(page, noalloc_get_block_write,
|
|
|
|
wbc, ext4_end_io_buffer_write);
|
|
|
|
} else
|
2009-05-14 06:54:29 +02:00
|
|
|
ret = block_write_full_page(page, noalloc_get_block_write,
|
|
|
|
wbc);
|
2008-07-12 01:27:31 +02:00
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2008-07-12 01:27:31 +02:00
|
|
|
/*
|
2008-08-20 04:15:58 +02:00
|
|
|
* This is called via ext4_da_writepages() to
|
2011-03-31 03:57:33 +02:00
|
|
|
* calculate the total number of credits to reserve to fit
|
2008-08-20 04:15:58 +02:00
|
|
|
* a single extent allocation into a single transaction,
|
|
|
|
* ext4_da_writpeages() will loop calling this before
|
|
|
|
* the block allocation.
|
2008-07-12 01:27:31 +02:00
|
|
|
*/
|
2008-08-20 04:15:58 +02:00
|
|
|
|
|
|
|
static int ext4_da_writepages_trans_blocks(struct inode *inode)
|
|
|
|
{
|
|
|
|
int max_blocks = EXT4_I(inode)->i_reserved_data_blocks;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* With non-extent format the journal credit needed to
|
|
|
|
* insert nrblocks contiguous block is dependent on
|
|
|
|
* number of contiguous block. So we will limit
|
|
|
|
* number of contiguous block to a sane value
|
|
|
|
*/
|
2010-05-17 04:00:00 +02:00
|
|
|
if (!(ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS)) &&
|
2008-08-20 04:15:58 +02:00
|
|
|
(max_blocks > EXT4_MAX_TRANS_DATA))
|
|
|
|
max_blocks = EXT4_MAX_TRANS_DATA;
|
|
|
|
|
|
|
|
return ext4_chunk_trans_blocks(inode, max_blocks);
|
|
|
|
}
|
2008-07-12 01:27:31 +02:00
|
|
|
|
2010-05-17 00:00:00 +02:00
|
|
|
/*
|
|
|
|
* write_cache_pages_da - walk the list of dirty pages of the given
|
2011-02-26 20:07:31 +01:00
|
|
|
* address space and accumulate pages that need writing, and call
|
2011-02-26 20:09:20 +01:00
|
|
|
* mpage_da_map_and_submit to map a single contiguous memory region
|
|
|
|
* and then write them.
|
2010-05-17 00:00:00 +02:00
|
|
|
*/
|
|
|
|
static int write_cache_pages_da(struct address_space *mapping,
|
|
|
|
struct writeback_control *wbc,
|
2010-10-28 03:30:13 +02:00
|
|
|
struct mpage_da_data *mpd,
|
|
|
|
pgoff_t *done_index)
|
2010-05-17 00:00:00 +02:00
|
|
|
{
|
2011-02-26 20:07:37 +01:00
|
|
|
struct buffer_head *bh, *head;
|
2011-02-26 20:09:20 +01:00
|
|
|
struct inode *inode = mapping->host;
|
2011-02-26 20:07:37 +01:00
|
|
|
struct pagevec pvec;
|
|
|
|
unsigned int nr_pages;
|
|
|
|
sector_t logical;
|
|
|
|
pgoff_t index, end;
|
|
|
|
long nr_to_write = wbc->nr_to_write;
|
|
|
|
int i, tag, ret = 0;
|
2010-05-17 00:00:00 +02:00
|
|
|
|
2011-02-26 20:09:20 +01:00
|
|
|
memset(mpd, 0, sizeof(struct mpage_da_data));
|
|
|
|
mpd->wbc = wbc;
|
|
|
|
mpd->inode = inode;
|
2010-05-17 00:00:00 +02:00
|
|
|
pagevec_init(&pvec, 0);
|
|
|
|
index = wbc->range_start >> PAGE_CACHE_SHIFT;
|
|
|
|
end = wbc->range_end >> PAGE_CACHE_SHIFT;
|
|
|
|
|
2010-06-06 18:38:15 +02:00
|
|
|
if (wbc->sync_mode == WB_SYNC_ALL || wbc->tagged_writepages)
|
ext4: implement writeback livelock avoidance using page tagging
This is analogous to Jan Kara's commit,
f446daaea9d4a420d16c606f755f3689dcb2d0ce
mm: implement writeback livelock avoidance using page tagging
but since we forked write_cache_pages, we need to reimplement
it there (and in ext4_da_writepages, since range_cyclic handling
was moved to there)
If you start a large buffered IO to a file, and then set
fsync after it, you'll find that fsync does not complete
until the other IO stops.
If you continue re-dirtying the file (say, putting dd
with conv=notrunc in a loop), when fsync finally completes
(after all IO is done), it reports via tracing that
it has written many more pages than the file contains;
in other words it has synced and re-synced pages in
the file multiple times.
This then leads to problems with our writeback_index
update, since it advances it by pages written, and
essentially sets writeback_index off the end of the
file...
With the following patch, we only sync as much as was
dirty at the time of the sync.
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2010-10-28 03:30:13 +02:00
|
|
|
tag = PAGECACHE_TAG_TOWRITE;
|
|
|
|
else
|
|
|
|
tag = PAGECACHE_TAG_DIRTY;
|
|
|
|
|
2010-10-28 03:30:13 +02:00
|
|
|
*done_index = index;
|
2011-02-26 20:07:37 +01:00
|
|
|
while (index <= end) {
|
ext4: implement writeback livelock avoidance using page tagging
This is analogous to Jan Kara's commit,
f446daaea9d4a420d16c606f755f3689dcb2d0ce
mm: implement writeback livelock avoidance using page tagging
but since we forked write_cache_pages, we need to reimplement
it there (and in ext4_da_writepages, since range_cyclic handling
was moved to there)
If you start a large buffered IO to a file, and then set
fsync after it, you'll find that fsync does not complete
until the other IO stops.
If you continue re-dirtying the file (say, putting dd
with conv=notrunc in a loop), when fsync finally completes
(after all IO is done), it reports via tracing that
it has written many more pages than the file contains;
in other words it has synced and re-synced pages in
the file multiple times.
This then leads to problems with our writeback_index
update, since it advances it by pages written, and
essentially sets writeback_index off the end of the
file...
With the following patch, we only sync as much as was
dirty at the time of the sync.
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2010-10-28 03:30:13 +02:00
|
|
|
nr_pages = pagevec_lookup_tag(&pvec, mapping, &index, tag,
|
2010-05-17 00:00:00 +02:00
|
|
|
min(end - index, (pgoff_t)PAGEVEC_SIZE-1) + 1);
|
|
|
|
if (nr_pages == 0)
|
2011-02-26 20:07:37 +01:00
|
|
|
return 0;
|
2010-05-17 00:00:00 +02:00
|
|
|
|
|
|
|
for (i = 0; i < nr_pages; i++) {
|
|
|
|
struct page *page = pvec.pages[i];
|
|
|
|
|
|
|
|
/*
|
|
|
|
* At this point, the page may be truncated or
|
|
|
|
* invalidated (changing page->mapping to NULL), or
|
|
|
|
* even swizzled back from swapper_space to tmpfs file
|
|
|
|
* mapping. However, page->index will not change
|
|
|
|
* because we have a reference on the page.
|
|
|
|
*/
|
2011-02-26 20:07:37 +01:00
|
|
|
if (page->index > end)
|
|
|
|
goto out;
|
2010-05-17 00:00:00 +02:00
|
|
|
|
2010-10-28 03:30:13 +02:00
|
|
|
*done_index = page->index + 1;
|
|
|
|
|
2011-02-26 20:09:14 +01:00
|
|
|
/*
|
|
|
|
* If we can't merge this page, and we have
|
|
|
|
* accumulated an contiguous region, write it
|
|
|
|
*/
|
|
|
|
if ((mpd->next_page != page->index) &&
|
|
|
|
(mpd->next_page != mpd->first_page)) {
|
|
|
|
mpage_da_map_and_submit(mpd);
|
|
|
|
goto ret_extent_tail;
|
|
|
|
}
|
|
|
|
|
2010-05-17 00:00:00 +02:00
|
|
|
lock_page(page);
|
|
|
|
|
|
|
|
/*
|
2011-02-26 20:07:37 +01:00
|
|
|
* If the page is no longer dirty, or its
|
|
|
|
* mapping no longer corresponds to inode we
|
|
|
|
* are writing (which means it has been
|
|
|
|
* truncated or invalidated), or the page is
|
|
|
|
* already under writeback and we are not
|
|
|
|
* doing a data integrity writeback, skip the page
|
2010-05-17 00:00:00 +02:00
|
|
|
*/
|
2011-02-26 20:07:37 +01:00
|
|
|
if (!PageDirty(page) ||
|
|
|
|
(PageWriteback(page) &&
|
|
|
|
(wbc->sync_mode == WB_SYNC_NONE)) ||
|
|
|
|
unlikely(page->mapping != mapping)) {
|
2010-05-17 00:00:00 +02:00
|
|
|
unlock_page(page);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2011-05-18 19:53:20 +02:00
|
|
|
wait_on_page_writeback(page);
|
2010-05-17 00:00:00 +02:00
|
|
|
BUG_ON(PageWriteback(page));
|
|
|
|
|
2011-02-26 20:09:20 +01:00
|
|
|
if (mpd->next_page != page->index)
|
2011-02-26 20:07:31 +01:00
|
|
|
mpd->first_page = page->index;
|
|
|
|
mpd->next_page = page->index + 1;
|
|
|
|
logical = (sector_t) page->index <<
|
|
|
|
(PAGE_CACHE_SHIFT - inode->i_blkbits);
|
|
|
|
|
|
|
|
if (!page_has_buffers(page)) {
|
2011-02-26 20:07:37 +01:00
|
|
|
mpage_add_bh_to_extent(mpd, logical,
|
|
|
|
PAGE_CACHE_SIZE,
|
2011-02-26 20:07:31 +01:00
|
|
|
(1 << BH_Dirty) | (1 << BH_Uptodate));
|
2011-02-26 20:07:37 +01:00
|
|
|
if (mpd->io_done)
|
|
|
|
goto ret_extent_tail;
|
2011-02-26 20:07:31 +01:00
|
|
|
} else {
|
|
|
|
/*
|
2011-02-26 20:07:37 +01:00
|
|
|
* Page with regular buffer heads,
|
|
|
|
* just add all dirty ones
|
2011-02-26 20:07:31 +01:00
|
|
|
*/
|
|
|
|
head = page_buffers(page);
|
|
|
|
bh = head;
|
|
|
|
do {
|
|
|
|
BUG_ON(buffer_locked(bh));
|
|
|
|
/*
|
|
|
|
* We need to try to allocate
|
|
|
|
* unmapped blocks in the same page.
|
|
|
|
* Otherwise we won't make progress
|
|
|
|
* with the page in ext4_writepage
|
|
|
|
*/
|
|
|
|
if (ext4_bh_delay_or_unwritten(NULL, bh)) {
|
|
|
|
mpage_add_bh_to_extent(mpd, logical,
|
|
|
|
bh->b_size,
|
|
|
|
bh->b_state);
|
2011-02-26 20:07:37 +01:00
|
|
|
if (mpd->io_done)
|
|
|
|
goto ret_extent_tail;
|
2011-02-26 20:07:31 +01:00
|
|
|
} else if (buffer_dirty(bh) && (buffer_mapped(bh))) {
|
|
|
|
/*
|
2011-02-26 20:07:37 +01:00
|
|
|
* mapped dirty buffer. We need
|
|
|
|
* to update the b_state
|
|
|
|
* because we look at b_state
|
|
|
|
* in mpage_da_map_blocks. We
|
|
|
|
* don't update b_size because
|
|
|
|
* if we find an unmapped
|
|
|
|
* buffer_head later we need to
|
|
|
|
* use the b_state flag of that
|
|
|
|
* buffer_head.
|
2011-02-26 20:07:31 +01:00
|
|
|
*/
|
|
|
|
if (mpd->b_size == 0)
|
|
|
|
mpd->b_state = bh->b_state & BH_FLAGS;
|
|
|
|
}
|
|
|
|
logical++;
|
|
|
|
} while ((bh = bh->b_this_page) != head);
|
2010-05-17 00:00:00 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
if (nr_to_write > 0) {
|
|
|
|
nr_to_write--;
|
|
|
|
if (nr_to_write == 0 &&
|
2011-02-26 20:07:37 +01:00
|
|
|
wbc->sync_mode == WB_SYNC_NONE)
|
2010-05-17 00:00:00 +02:00
|
|
|
/*
|
|
|
|
* We stop writing back only if we are
|
|
|
|
* not doing integrity sync. In case of
|
|
|
|
* integrity sync we have to keep going
|
|
|
|
* because someone may be concurrently
|
|
|
|
* dirtying pages, and we might have
|
|
|
|
* synced a lot of newly appeared dirty
|
|
|
|
* pages, but have not synced all of the
|
|
|
|
* old dirty pages.
|
|
|
|
*/
|
2011-02-26 20:07:37 +01:00
|
|
|
goto out;
|
2010-05-17 00:00:00 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
pagevec_release(&pvec);
|
|
|
|
cond_resched();
|
|
|
|
}
|
2011-02-26 20:07:37 +01:00
|
|
|
return 0;
|
|
|
|
ret_extent_tail:
|
|
|
|
ret = MPAGE_DA_EXTENT_TAIL;
|
2011-02-26 20:07:31 +01:00
|
|
|
out:
|
|
|
|
pagevec_release(&pvec);
|
|
|
|
cond_resched();
|
2010-05-17 00:00:00 +02:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2008-07-12 01:27:31 +02:00
|
|
|
static int ext4_da_writepages(struct address_space *mapping,
|
2008-08-20 03:55:02 +02:00
|
|
|
struct writeback_control *wbc)
|
2008-07-12 01:27:31 +02:00
|
|
|
{
|
2008-10-16 16:10:36 +02:00
|
|
|
pgoff_t index;
|
|
|
|
int range_whole = 0;
|
2008-07-12 01:27:31 +02:00
|
|
|
handle_t *handle = NULL;
|
2008-09-09 05:05:34 +02:00
|
|
|
struct mpage_da_data mpd;
|
2008-08-19 00:00:57 +02:00
|
|
|
struct inode *inode = mapping->host;
|
2008-11-05 06:14:04 +01:00
|
|
|
int pages_written = 0;
|
2009-09-29 19:31:31 +02:00
|
|
|
unsigned int max_pages;
|
2009-02-14 16:42:58 +01:00
|
|
|
int range_cyclic, cycled = 1, io_done = 0;
|
2009-09-29 19:31:31 +02:00
|
|
|
int needed_blocks, ret = 0;
|
|
|
|
long desired_nr_to_write, nr_to_writebump = 0;
|
2009-08-31 23:00:59 +02:00
|
|
|
loff_t range_start = wbc->range_start;
|
2008-08-19 00:00:57 +02:00
|
|
|
struct ext4_sb_info *sbi = EXT4_SB(mapping->host->i_sb);
|
2010-10-28 03:30:13 +02:00
|
|
|
pgoff_t done_index = 0;
|
ext4: implement writeback livelock avoidance using page tagging
This is analogous to Jan Kara's commit,
f446daaea9d4a420d16c606f755f3689dcb2d0ce
mm: implement writeback livelock avoidance using page tagging
but since we forked write_cache_pages, we need to reimplement
it there (and in ext4_da_writepages, since range_cyclic handling
was moved to there)
If you start a large buffered IO to a file, and then set
fsync after it, you'll find that fsync does not complete
until the other IO stops.
If you continue re-dirtying the file (say, putting dd
with conv=notrunc in a loop), when fsync finally completes
(after all IO is done), it reports via tracing that
it has written many more pages than the file contains;
in other words it has synced and re-synced pages in
the file multiple times.
This then leads to problems with our writeback_index
update, since it advances it by pages written, and
essentially sets writeback_index off the end of the
file...
With the following patch, we only sync as much as was
dirty at the time of the sync.
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2010-10-28 03:30:13 +02:00
|
|
|
pgoff_t end;
|
2008-07-12 01:27:31 +02:00
|
|
|
|
2009-06-17 17:48:11 +02:00
|
|
|
trace_ext4_da_writepages(inode, wbc);
|
2009-01-04 02:03:21 +01:00
|
|
|
|
2008-07-12 01:27:31 +02:00
|
|
|
/*
|
|
|
|
* No pages to write? This is mainly a kludge to avoid starting
|
|
|
|
* a transaction for special inodes like journal inode on last iput()
|
|
|
|
* because that could violate lock ordering on umount
|
|
|
|
*/
|
2008-08-20 03:55:02 +02:00
|
|
|
if (!mapping->nrpages || !mapping_tagged(mapping, PAGECACHE_TAG_DIRTY))
|
2008-07-12 01:27:31 +02:00
|
|
|
return 0;
|
2008-11-05 15:22:24 +01:00
|
|
|
|
|
|
|
/*
|
|
|
|
* If the filesystem has aborted, it is read-only, so return
|
|
|
|
* right away instead of dumping stack traces later on that
|
|
|
|
* will obscure the real source of the problem. We test
|
2009-06-13 16:09:36 +02:00
|
|
|
* EXT4_MF_FS_ABORTED instead of sb->s_flag's MS_RDONLY because
|
2008-11-05 15:22:24 +01:00
|
|
|
* the latter could be true if the filesystem is mounted
|
|
|
|
* read-only, and in that case, ext4_da_writepages should
|
|
|
|
* *never* be called, so if that ever happens, we would want
|
|
|
|
* the stack trace.
|
|
|
|
*/
|
2009-06-13 16:09:36 +02:00
|
|
|
if (unlikely(sbi->s_mount_flags & EXT4_MF_FS_ABORTED))
|
2008-11-05 15:22:24 +01:00
|
|
|
return -EROFS;
|
|
|
|
|
2008-10-16 16:10:36 +02:00
|
|
|
if (wbc->range_start == 0 && wbc->range_end == LLONG_MAX)
|
|
|
|
range_whole = 1;
|
2008-07-12 01:27:31 +02:00
|
|
|
|
2009-02-14 16:42:58 +01:00
|
|
|
range_cyclic = wbc->range_cyclic;
|
|
|
|
if (wbc->range_cyclic) {
|
2008-10-16 16:10:36 +02:00
|
|
|
index = mapping->writeback_index;
|
2009-02-14 16:42:58 +01:00
|
|
|
if (index)
|
|
|
|
cycled = 0;
|
|
|
|
wbc->range_start = index << PAGE_CACHE_SHIFT;
|
|
|
|
wbc->range_end = LLONG_MAX;
|
|
|
|
wbc->range_cyclic = 0;
|
ext4: implement writeback livelock avoidance using page tagging
This is analogous to Jan Kara's commit,
f446daaea9d4a420d16c606f755f3689dcb2d0ce
mm: implement writeback livelock avoidance using page tagging
but since we forked write_cache_pages, we need to reimplement
it there (and in ext4_da_writepages, since range_cyclic handling
was moved to there)
If you start a large buffered IO to a file, and then set
fsync after it, you'll find that fsync does not complete
until the other IO stops.
If you continue re-dirtying the file (say, putting dd
with conv=notrunc in a loop), when fsync finally completes
(after all IO is done), it reports via tracing that
it has written many more pages than the file contains;
in other words it has synced and re-synced pages in
the file multiple times.
This then leads to problems with our writeback_index
update, since it advances it by pages written, and
essentially sets writeback_index off the end of the
file...
With the following patch, we only sync as much as was
dirty at the time of the sync.
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2010-10-28 03:30:13 +02:00
|
|
|
end = -1;
|
|
|
|
} else {
|
2008-10-16 16:10:36 +02:00
|
|
|
index = wbc->range_start >> PAGE_CACHE_SHIFT;
|
ext4: implement writeback livelock avoidance using page tagging
This is analogous to Jan Kara's commit,
f446daaea9d4a420d16c606f755f3689dcb2d0ce
mm: implement writeback livelock avoidance using page tagging
but since we forked write_cache_pages, we need to reimplement
it there (and in ext4_da_writepages, since range_cyclic handling
was moved to there)
If you start a large buffered IO to a file, and then set
fsync after it, you'll find that fsync does not complete
until the other IO stops.
If you continue re-dirtying the file (say, putting dd
with conv=notrunc in a loop), when fsync finally completes
(after all IO is done), it reports via tracing that
it has written many more pages than the file contains;
in other words it has synced and re-synced pages in
the file multiple times.
This then leads to problems with our writeback_index
update, since it advances it by pages written, and
essentially sets writeback_index off the end of the
file...
With the following patch, we only sync as much as was
dirty at the time of the sync.
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2010-10-28 03:30:13 +02:00
|
|
|
end = wbc->range_end >> PAGE_CACHE_SHIFT;
|
|
|
|
}
|
2008-08-20 03:55:02 +02:00
|
|
|
|
2009-09-29 19:31:31 +02:00
|
|
|
/*
|
|
|
|
* This works around two forms of stupidity. The first is in
|
|
|
|
* the writeback code, which caps the maximum number of pages
|
|
|
|
* written to be 1024 pages. This is wrong on multiple
|
|
|
|
* levels; different architectues have a different page size,
|
|
|
|
* which changes the maximum amount of data which gets
|
|
|
|
* written. Secondly, 4 megabytes is way too small. XFS
|
|
|
|
* forces this value to be 16 megabytes by multiplying
|
|
|
|
* nr_to_write parameter by four, and then relies on its
|
|
|
|
* allocator to allocate larger extents to make them
|
|
|
|
* contiguous. Unfortunately this brings us to the second
|
|
|
|
* stupidity, which is that ext4's mballoc code only allocates
|
|
|
|
* at most 2048 blocks. So we force contiguous writes up to
|
|
|
|
* the number of dirty blocks in the inode, or
|
|
|
|
* sbi->max_writeback_mb_bump whichever is smaller.
|
|
|
|
*/
|
|
|
|
max_pages = sbi->s_max_writeback_mb_bump << (20 - PAGE_CACHE_SHIFT);
|
2010-10-28 03:30:03 +02:00
|
|
|
if (!range_cyclic && range_whole) {
|
|
|
|
if (wbc->nr_to_write == LONG_MAX)
|
|
|
|
desired_nr_to_write = wbc->nr_to_write;
|
|
|
|
else
|
|
|
|
desired_nr_to_write = wbc->nr_to_write * 8;
|
|
|
|
} else
|
2009-09-29 19:31:31 +02:00
|
|
|
desired_nr_to_write = ext4_num_dirty_pages(inode, index,
|
|
|
|
max_pages);
|
|
|
|
if (desired_nr_to_write > max_pages)
|
|
|
|
desired_nr_to_write = max_pages;
|
|
|
|
|
|
|
|
if (wbc->nr_to_write < desired_nr_to_write) {
|
|
|
|
nr_to_writebump = desired_nr_to_write - wbc->nr_to_write;
|
|
|
|
wbc->nr_to_write = desired_nr_to_write;
|
|
|
|
}
|
|
|
|
|
2009-02-14 16:42:58 +01:00
|
|
|
retry:
|
2010-06-06 18:38:15 +02:00
|
|
|
if (wbc->sync_mode == WB_SYNC_ALL || wbc->tagged_writepages)
|
ext4: implement writeback livelock avoidance using page tagging
This is analogous to Jan Kara's commit,
f446daaea9d4a420d16c606f755f3689dcb2d0ce
mm: implement writeback livelock avoidance using page tagging
but since we forked write_cache_pages, we need to reimplement
it there (and in ext4_da_writepages, since range_cyclic handling
was moved to there)
If you start a large buffered IO to a file, and then set
fsync after it, you'll find that fsync does not complete
until the other IO stops.
If you continue re-dirtying the file (say, putting dd
with conv=notrunc in a loop), when fsync finally completes
(after all IO is done), it reports via tracing that
it has written many more pages than the file contains;
in other words it has synced and re-synced pages in
the file multiple times.
This then leads to problems with our writeback_index
update, since it advances it by pages written, and
essentially sets writeback_index off the end of the
file...
With the following patch, we only sync as much as was
dirty at the time of the sync.
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2010-10-28 03:30:13 +02:00
|
|
|
tag_pages_for_writeback(mapping, index, end);
|
|
|
|
|
2008-10-16 16:10:36 +02:00
|
|
|
while (!ret && wbc->nr_to_write > 0) {
|
2008-08-20 03:55:02 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
* we insert one extent at a time. So we need
|
|
|
|
* credit needed for single extent allocation.
|
|
|
|
* journalled mode is currently not supported
|
|
|
|
* by delalloc
|
|
|
|
*/
|
|
|
|
BUG_ON(ext4_should_journal_data(inode));
|
2008-08-20 04:15:58 +02:00
|
|
|
needed_blocks = ext4_da_writepages_trans_blocks(inode);
|
2008-08-20 03:55:02 +02:00
|
|
|
|
2008-07-12 01:27:31 +02:00
|
|
|
/* start a new transaction*/
|
|
|
|
handle = ext4_journal_start(inode, needed_blocks);
|
|
|
|
if (IS_ERR(handle)) {
|
|
|
|
ret = PTR_ERR(handle);
|
2009-09-26 23:43:59 +02:00
|
|
|
ext4_msg(inode->i_sb, KERN_CRIT, "%s: jbd2_start: "
|
2010-05-16 19:00:00 +02:00
|
|
|
"%ld pages, ino %lu; err %d", __func__,
|
2008-08-20 03:55:02 +02:00
|
|
|
wbc->nr_to_write, inode->i_ino, ret);
|
2008-07-12 01:27:31 +02:00
|
|
|
goto out_writepages;
|
|
|
|
}
|
2009-02-23 22:42:39 +01:00
|
|
|
|
|
|
|
/*
|
2011-02-26 20:07:31 +01:00
|
|
|
* Now call write_cache_pages_da() to find the next
|
2009-02-23 22:42:39 +01:00
|
|
|
* contiguous region of logical blocks that need
|
2011-02-26 20:07:31 +01:00
|
|
|
* blocks to be allocated by ext4 and submit them.
|
2009-02-23 22:42:39 +01:00
|
|
|
*/
|
2010-10-28 03:30:13 +02:00
|
|
|
ret = write_cache_pages_da(mapping, wbc, &mpd, &done_index);
|
2009-02-23 22:42:39 +01:00
|
|
|
/*
|
tree-wide: fix assorted typos all over the place
That is "success", "unknown", "through", "performance", "[re|un]mapping"
, "access", "default", "reasonable", "[con]currently", "temperature"
, "channel", "[un]used", "application", "example","hierarchy", "therefore"
, "[over|under]flow", "contiguous", "threshold", "enough" and others.
Signed-off-by: André Goddard Rosa <andre.goddard@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
2009-11-14 16:09:05 +01:00
|
|
|
* If we have a contiguous extent of pages and we
|
2009-02-23 22:42:39 +01:00
|
|
|
* haven't done the I/O yet, map the blocks and submit
|
|
|
|
* them for I/O.
|
|
|
|
*/
|
|
|
|
if (!mpd.io_done && mpd.next_page != mpd.first_page) {
|
2010-10-28 03:30:09 +02:00
|
|
|
mpage_da_map_and_submit(&mpd);
|
2009-02-23 22:42:39 +01:00
|
|
|
ret = MPAGE_DA_EXTENT_TAIL;
|
|
|
|
}
|
2009-09-01 05:13:11 +02:00
|
|
|
trace_ext4_da_write_pages(inode, &mpd);
|
2009-02-23 22:42:39 +01:00
|
|
|
wbc->nr_to_write -= mpd.pages_written;
|
2008-09-09 05:05:34 +02:00
|
|
|
|
2008-07-12 01:27:31 +02:00
|
|
|
ext4_journal_stop(handle);
|
2008-09-09 05:05:34 +02:00
|
|
|
|
2009-02-26 06:57:35 +01:00
|
|
|
if ((mpd.retval == -ENOSPC) && sbi->s_journal) {
|
2008-10-16 16:10:36 +02:00
|
|
|
/* commit the transaction which would
|
|
|
|
* free blocks released in the transaction
|
|
|
|
* and try again
|
|
|
|
*/
|
2008-09-09 05:05:34 +02:00
|
|
|
jbd2_journal_force_commit_nested(sbi->s_journal);
|
2008-10-16 16:10:36 +02:00
|
|
|
ret = 0;
|
|
|
|
} else if (ret == MPAGE_DA_EXTENT_TAIL) {
|
2008-08-20 03:55:02 +02:00
|
|
|
/*
|
|
|
|
* got one extent now try with
|
|
|
|
* rest of the pages
|
|
|
|
*/
|
2008-10-16 16:10:36 +02:00
|
|
|
pages_written += mpd.pages_written;
|
2008-08-20 03:55:02 +02:00
|
|
|
ret = 0;
|
2009-02-14 16:42:58 +01:00
|
|
|
io_done = 1;
|
2008-10-16 16:10:36 +02:00
|
|
|
} else if (wbc->nr_to_write)
|
2008-07-12 01:27:31 +02:00
|
|
|
/*
|
|
|
|
* There is no more writeout needed
|
|
|
|
* or we requested for a noblocking writeout
|
|
|
|
* and we found the device congested
|
|
|
|
*/
|
|
|
|
break;
|
2008-08-20 03:55:02 +02:00
|
|
|
}
|
2009-02-14 16:42:58 +01:00
|
|
|
if (!io_done && !cycled) {
|
|
|
|
cycled = 1;
|
|
|
|
index = 0;
|
|
|
|
wbc->range_start = index << PAGE_CACHE_SHIFT;
|
|
|
|
wbc->range_end = mapping->writeback_index - 1;
|
|
|
|
goto retry;
|
|
|
|
}
|
2008-10-16 16:10:36 +02:00
|
|
|
|
|
|
|
/* Update index */
|
2009-02-14 16:42:58 +01:00
|
|
|
wbc->range_cyclic = range_cyclic;
|
2008-10-16 16:10:36 +02:00
|
|
|
if (wbc->range_cyclic || (range_whole && wbc->nr_to_write > 0))
|
|
|
|
/*
|
|
|
|
* set the writeback_index so that range_cyclic
|
|
|
|
* mode will write it back later
|
|
|
|
*/
|
2010-10-28 03:30:13 +02:00
|
|
|
mapping->writeback_index = done_index;
|
2008-08-20 03:55:02 +02:00
|
|
|
|
2008-07-12 01:27:31 +02:00
|
|
|
out_writepages:
|
2009-12-25 21:46:07 +01:00
|
|
|
wbc->nr_to_write -= nr_to_writebump;
|
2009-08-31 23:00:59 +02:00
|
|
|
wbc->range_start = range_start;
|
2009-06-17 17:48:11 +02:00
|
|
|
trace_ext4_da_writepages_result(inode, wbc, ret, pages_written);
|
2008-07-12 01:27:31 +02:00
|
|
|
return ret;
|
2008-07-12 01:27:31 +02:00
|
|
|
}
|
|
|
|
|
2008-10-09 05:13:30 +02:00
|
|
|
#define FALL_BACK_TO_NONDELALLOC 1
|
|
|
|
static int ext4_nonda_switch(struct super_block *sb)
|
|
|
|
{
|
|
|
|
s64 free_blocks, dirty_blocks;
|
|
|
|
struct ext4_sb_info *sbi = EXT4_SB(sb);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* switch to non delalloc mode if we are running low
|
|
|
|
* on free block. The free block accounting via percpu
|
2009-01-06 23:41:04 +01:00
|
|
|
* counters can get slightly wrong with percpu_counter_batch getting
|
2008-10-09 05:13:30 +02:00
|
|
|
* accumulated on each CPU without updating global counters
|
|
|
|
* Delalloc need an accurate free block accounting. So switch
|
|
|
|
* to non delalloc when we are near to error range.
|
|
|
|
*/
|
2011-09-10 00:56:51 +02:00
|
|
|
free_blocks = EXT4_C2B(sbi,
|
|
|
|
percpu_counter_read_positive(&sbi->s_freeclusters_counter));
|
|
|
|
dirty_blocks = percpu_counter_read_positive(&sbi->s_dirtyclusters_counter);
|
2008-10-09 05:13:30 +02:00
|
|
|
if (2 * free_blocks < 3 * dirty_blocks ||
|
2011-09-10 01:16:51 +02:00
|
|
|
free_blocks < (dirty_blocks + EXT4_FREECLUSTERS_WATERMARK)) {
|
2008-10-09 05:13:30 +02:00
|
|
|
/*
|
2009-12-23 13:58:12 +01:00
|
|
|
* free block count is less than 150% of dirty blocks
|
|
|
|
* or free blocks is less than watermark
|
2008-10-09 05:13:30 +02:00
|
|
|
*/
|
|
|
|
return 1;
|
|
|
|
}
|
2009-12-23 13:58:12 +01:00
|
|
|
/*
|
|
|
|
* Even if we don't switch but are nearing capacity,
|
|
|
|
* start pushing delalloc when 1/2 of free blocks are dirty.
|
|
|
|
*/
|
|
|
|
if (free_blocks < 2 * dirty_blocks)
|
|
|
|
writeback_inodes_sb_if_idle(sb);
|
|
|
|
|
2008-10-09 05:13:30 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2008-07-12 01:27:31 +02:00
|
|
|
static int ext4_da_write_begin(struct file *file, struct address_space *mapping,
|
2009-06-14 23:45:34 +02:00
|
|
|
loff_t pos, unsigned len, unsigned flags,
|
|
|
|
struct page **pagep, void **fsdata)
|
2008-07-12 01:27:31 +02:00
|
|
|
{
|
2010-05-16 17:00:00 +02:00
|
|
|
int ret, retries = 0;
|
2008-07-12 01:27:31 +02:00
|
|
|
struct page *page;
|
|
|
|
pgoff_t index;
|
|
|
|
struct inode *inode = mapping->host;
|
|
|
|
handle_t *handle;
|
2011-09-07 03:53:01 +02:00
|
|
|
loff_t page_len;
|
2008-07-12 01:27:31 +02:00
|
|
|
|
|
|
|
index = pos >> PAGE_CACHE_SHIFT;
|
2008-10-09 05:13:30 +02:00
|
|
|
|
|
|
|
if (ext4_nonda_switch(inode->i_sb)) {
|
|
|
|
*fsdata = (void *)FALL_BACK_TO_NONDELALLOC;
|
|
|
|
return ext4_write_begin(file, mapping, pos,
|
|
|
|
len, flags, pagep, fsdata);
|
|
|
|
}
|
|
|
|
*fsdata = (void *)0;
|
2009-06-17 17:48:11 +02:00
|
|
|
trace_ext4_da_write_begin(inode, pos, len, flags);
|
2008-07-14 23:52:37 +02:00
|
|
|
retry:
|
2008-07-12 01:27:31 +02:00
|
|
|
/*
|
|
|
|
* With delayed allocation, we don't log the i_disksize update
|
|
|
|
* if there is delayed block allocation. But we still need
|
|
|
|
* to journalling the i_disksize update if writes to the end
|
|
|
|
* of file which has an already mapped buffer.
|
|
|
|
*/
|
|
|
|
handle = ext4_journal_start(inode, 1);
|
|
|
|
if (IS_ERR(handle)) {
|
|
|
|
ret = PTR_ERR(handle);
|
|
|
|
goto out;
|
|
|
|
}
|
2009-02-23 03:09:59 +01:00
|
|
|
/* We cannot recurse into the filesystem as the transaction is already
|
|
|
|
* started */
|
|
|
|
flags |= AOP_FLAG_NOFS;
|
2008-07-12 01:27:31 +02:00
|
|
|
|
fs: symlink write_begin allocation context fix
With the write_begin/write_end aops, page_symlink was broken because it
could no longer pass a GFP_NOFS type mask into the point where the
allocations happened. They are done in write_begin, which would always
assume that the filesystem can be entered from reclaim. This bug could
cause filesystem deadlocks.
The funny thing with having a gfp_t mask there is that it doesn't really
allow the caller to arbitrarily tinker with the context in which it can be
called. It couldn't ever be GFP_ATOMIC, for example, because it needs to
take the page lock. The only thing any callers care about is __GFP_FS
anyway, so turn that into a single flag.
Add a new flag for write_begin, AOP_FLAG_NOFS. Filesystems can now act on
this flag in their write_begin function. Change __grab_cache_page to
accept a nofs argument as well, to honour that flag (while we're there,
change the name to grab_cache_page_write_begin which is more instructive
and does away with random leading underscores).
This is really a more flexible way to go in the end anyway -- if a
filesystem happens to want any extra allocations aside from the pagecache
ones in ints write_begin function, it may now use GFP_KERNEL (rather than
GFP_NOFS) for common case allocations (eg. ocfs2_alloc_write_ctxt, for a
random example).
[kosaki.motohiro@jp.fujitsu.com: fix ubifs]
[kosaki.motohiro@jp.fujitsu.com: fix fuse]
Signed-off-by: Nick Piggin <npiggin@suse.de>
Reviewed-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Cc: <stable@kernel.org> [2.6.28.x]
Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
[ Cleaned up the calling convention: just pass in the AOP flags
untouched to the grab_cache_page_write_begin() function. That
just simplifies everybody, and may even allow future expansion of the
logic. - Linus ]
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2009-01-04 21:00:53 +01:00
|
|
|
page = grab_cache_page_write_begin(mapping, index, flags);
|
2008-08-03 00:51:06 +02:00
|
|
|
if (!page) {
|
|
|
|
ext4_journal_stop(handle);
|
|
|
|
ret = -ENOMEM;
|
|
|
|
goto out;
|
|
|
|
}
|
2008-07-12 01:27:31 +02:00
|
|
|
*pagep = page;
|
|
|
|
|
2010-06-04 11:29:57 +02:00
|
|
|
ret = __block_write_begin(page, pos, len, ext4_da_get_block_prep);
|
2008-07-12 01:27:31 +02:00
|
|
|
if (ret < 0) {
|
|
|
|
unlock_page(page);
|
|
|
|
ext4_journal_stop(handle);
|
|
|
|
page_cache_release(page);
|
2008-09-13 19:10:25 +02:00
|
|
|
/*
|
|
|
|
* block_write_begin may have instantiated a few blocks
|
|
|
|
* outside i_size. Trim these off again. Don't need
|
|
|
|
* i_size_read because we hold i_mutex.
|
|
|
|
*/
|
|
|
|
if (pos + len > inode->i_size)
|
2009-12-09 03:24:33 +01:00
|
|
|
ext4_truncate_failed_write(inode);
|
2011-09-07 03:53:01 +02:00
|
|
|
} else {
|
|
|
|
page_len = pos & (PAGE_CACHE_SIZE - 1);
|
|
|
|
if (page_len > 0) {
|
|
|
|
ret = ext4_discard_partial_page_buffers_no_lock(handle,
|
|
|
|
inode, page, pos - page_len, page_len,
|
|
|
|
EXT4_DISCARD_PARTIAL_PG_ZERO_UNMAPPED);
|
|
|
|
}
|
2008-07-12 01:27:31 +02:00
|
|
|
}
|
|
|
|
|
2008-07-14 23:52:37 +02:00
|
|
|
if (ret == -ENOSPC && ext4_should_retry_alloc(inode->i_sb, &retries))
|
|
|
|
goto retry;
|
2008-07-12 01:27:31 +02:00
|
|
|
out:
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
ext4: fix delalloc i_disksize early update issue
Ext4_da_write_end() used walk_page_buffers() with a callback function of
ext4_bh_unmapped_or_delay() to check if it extended the file size
without allocating any blocks (since in this case i_disksize needs to be
updated). However, this is didn't work proprely because the buffer head
has not been marked dirty yet --- this is done later in
block_commit_write() --- which caused ext4_bh_unmapped_or_delay() to
always return false.
In addition, walk_page_buffers() checks all of the buffer heads covering
the page, and the only buffer_head that should be checked is the one
covering the end of the write. Otherwise, given a 1k blocksize
filesystem and a 4k page size, the buffer head covering the first 1k
stripe of the file could be unmapped (because it was a sparse file), and
the second or third buffer_head covering that page could be mapped, and
using walk_page_buffers() would fail in this case since it would stop at
the first unmapped buffer_head and return true.
The core problem is that walk_page_buffers() was intended to do work in
a callback function, and a non-zero return value indicated a failure,
which termined the walk of the buffer heads covering the page. It was
not intended to be used with a boolean function, such as
ext4_bh_unmapped_or_delay().
Add addtional fix from Aneesh to protect i_disksize update rave with truncate.
Signed-off-by: Mingming Cao <cmm@us.ibm.com>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-07-12 01:27:31 +02:00
|
|
|
/*
|
|
|
|
* Check if we should update i_disksize
|
|
|
|
* when write to the end of file but not require block allocation
|
|
|
|
*/
|
|
|
|
static int ext4_da_should_update_i_disksize(struct page *page,
|
2009-06-14 23:45:34 +02:00
|
|
|
unsigned long offset)
|
ext4: fix delalloc i_disksize early update issue
Ext4_da_write_end() used walk_page_buffers() with a callback function of
ext4_bh_unmapped_or_delay() to check if it extended the file size
without allocating any blocks (since in this case i_disksize needs to be
updated). However, this is didn't work proprely because the buffer head
has not been marked dirty yet --- this is done later in
block_commit_write() --- which caused ext4_bh_unmapped_or_delay() to
always return false.
In addition, walk_page_buffers() checks all of the buffer heads covering
the page, and the only buffer_head that should be checked is the one
covering the end of the write. Otherwise, given a 1k blocksize
filesystem and a 4k page size, the buffer head covering the first 1k
stripe of the file could be unmapped (because it was a sparse file), and
the second or third buffer_head covering that page could be mapped, and
using walk_page_buffers() would fail in this case since it would stop at
the first unmapped buffer_head and return true.
The core problem is that walk_page_buffers() was intended to do work in
a callback function, and a non-zero return value indicated a failure,
which termined the walk of the buffer heads covering the page. It was
not intended to be used with a boolean function, such as
ext4_bh_unmapped_or_delay().
Add addtional fix from Aneesh to protect i_disksize update rave with truncate.
Signed-off-by: Mingming Cao <cmm@us.ibm.com>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-07-12 01:27:31 +02:00
|
|
|
{
|
|
|
|
struct buffer_head *bh;
|
|
|
|
struct inode *inode = page->mapping->host;
|
|
|
|
unsigned int idx;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
bh = page_buffers(page);
|
|
|
|
idx = offset >> inode->i_blkbits;
|
|
|
|
|
2008-09-09 04:25:24 +02:00
|
|
|
for (i = 0; i < idx; i++)
|
ext4: fix delalloc i_disksize early update issue
Ext4_da_write_end() used walk_page_buffers() with a callback function of
ext4_bh_unmapped_or_delay() to check if it extended the file size
without allocating any blocks (since in this case i_disksize needs to be
updated). However, this is didn't work proprely because the buffer head
has not been marked dirty yet --- this is done later in
block_commit_write() --- which caused ext4_bh_unmapped_or_delay() to
always return false.
In addition, walk_page_buffers() checks all of the buffer heads covering
the page, and the only buffer_head that should be checked is the one
covering the end of the write. Otherwise, given a 1k blocksize
filesystem and a 4k page size, the buffer head covering the first 1k
stripe of the file could be unmapped (because it was a sparse file), and
the second or third buffer_head covering that page could be mapped, and
using walk_page_buffers() would fail in this case since it would stop at
the first unmapped buffer_head and return true.
The core problem is that walk_page_buffers() was intended to do work in
a callback function, and a non-zero return value indicated a failure,
which termined the walk of the buffer heads covering the page. It was
not intended to be used with a boolean function, such as
ext4_bh_unmapped_or_delay().
Add addtional fix from Aneesh to protect i_disksize update rave with truncate.
Signed-off-by: Mingming Cao <cmm@us.ibm.com>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-07-12 01:27:31 +02:00
|
|
|
bh = bh->b_this_page;
|
|
|
|
|
2009-05-12 22:30:27 +02:00
|
|
|
if (!buffer_mapped(bh) || (buffer_delay(bh)) || buffer_unwritten(bh))
|
ext4: fix delalloc i_disksize early update issue
Ext4_da_write_end() used walk_page_buffers() with a callback function of
ext4_bh_unmapped_or_delay() to check if it extended the file size
without allocating any blocks (since in this case i_disksize needs to be
updated). However, this is didn't work proprely because the buffer head
has not been marked dirty yet --- this is done later in
block_commit_write() --- which caused ext4_bh_unmapped_or_delay() to
always return false.
In addition, walk_page_buffers() checks all of the buffer heads covering
the page, and the only buffer_head that should be checked is the one
covering the end of the write. Otherwise, given a 1k blocksize
filesystem and a 4k page size, the buffer head covering the first 1k
stripe of the file could be unmapped (because it was a sparse file), and
the second or third buffer_head covering that page could be mapped, and
using walk_page_buffers() would fail in this case since it would stop at
the first unmapped buffer_head and return true.
The core problem is that walk_page_buffers() was intended to do work in
a callback function, and a non-zero return value indicated a failure,
which termined the walk of the buffer heads covering the page. It was
not intended to be used with a boolean function, such as
ext4_bh_unmapped_or_delay().
Add addtional fix from Aneesh to protect i_disksize update rave with truncate.
Signed-off-by: Mingming Cao <cmm@us.ibm.com>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-07-12 01:27:31 +02:00
|
|
|
return 0;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2008-07-12 01:27:31 +02:00
|
|
|
static int ext4_da_write_end(struct file *file,
|
2009-06-14 23:45:34 +02:00
|
|
|
struct address_space *mapping,
|
|
|
|
loff_t pos, unsigned len, unsigned copied,
|
|
|
|
struct page *page, void *fsdata)
|
2008-07-12 01:27:31 +02:00
|
|
|
{
|
|
|
|
struct inode *inode = mapping->host;
|
|
|
|
int ret = 0, ret2;
|
|
|
|
handle_t *handle = ext4_journal_current_handle();
|
|
|
|
loff_t new_i_size;
|
ext4: fix delalloc i_disksize early update issue
Ext4_da_write_end() used walk_page_buffers() with a callback function of
ext4_bh_unmapped_or_delay() to check if it extended the file size
without allocating any blocks (since in this case i_disksize needs to be
updated). However, this is didn't work proprely because the buffer head
has not been marked dirty yet --- this is done later in
block_commit_write() --- which caused ext4_bh_unmapped_or_delay() to
always return false.
In addition, walk_page_buffers() checks all of the buffer heads covering
the page, and the only buffer_head that should be checked is the one
covering the end of the write. Otherwise, given a 1k blocksize
filesystem and a 4k page size, the buffer head covering the first 1k
stripe of the file could be unmapped (because it was a sparse file), and
the second or third buffer_head covering that page could be mapped, and
using walk_page_buffers() would fail in this case since it would stop at
the first unmapped buffer_head and return true.
The core problem is that walk_page_buffers() was intended to do work in
a callback function, and a non-zero return value indicated a failure,
which termined the walk of the buffer heads covering the page. It was
not intended to be used with a boolean function, such as
ext4_bh_unmapped_or_delay().
Add addtional fix from Aneesh to protect i_disksize update rave with truncate.
Signed-off-by: Mingming Cao <cmm@us.ibm.com>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-07-12 01:27:31 +02:00
|
|
|
unsigned long start, end;
|
2008-10-09 05:13:30 +02:00
|
|
|
int write_mode = (int)(unsigned long)fsdata;
|
2011-09-07 03:53:01 +02:00
|
|
|
loff_t page_len;
|
2008-10-09 05:13:30 +02:00
|
|
|
|
|
|
|
if (write_mode == FALL_BACK_TO_NONDELALLOC) {
|
|
|
|
if (ext4_should_order_data(inode)) {
|
|
|
|
return ext4_ordered_write_end(file, mapping, pos,
|
|
|
|
len, copied, page, fsdata);
|
|
|
|
} else if (ext4_should_writeback_data(inode)) {
|
|
|
|
return ext4_writeback_write_end(file, mapping, pos,
|
|
|
|
len, copied, page, fsdata);
|
|
|
|
} else {
|
|
|
|
BUG();
|
|
|
|
}
|
|
|
|
}
|
ext4: fix delalloc i_disksize early update issue
Ext4_da_write_end() used walk_page_buffers() with a callback function of
ext4_bh_unmapped_or_delay() to check if it extended the file size
without allocating any blocks (since in this case i_disksize needs to be
updated). However, this is didn't work proprely because the buffer head
has not been marked dirty yet --- this is done later in
block_commit_write() --- which caused ext4_bh_unmapped_or_delay() to
always return false.
In addition, walk_page_buffers() checks all of the buffer heads covering
the page, and the only buffer_head that should be checked is the one
covering the end of the write. Otherwise, given a 1k blocksize
filesystem and a 4k page size, the buffer head covering the first 1k
stripe of the file could be unmapped (because it was a sparse file), and
the second or third buffer_head covering that page could be mapped, and
using walk_page_buffers() would fail in this case since it would stop at
the first unmapped buffer_head and return true.
The core problem is that walk_page_buffers() was intended to do work in
a callback function, and a non-zero return value indicated a failure,
which termined the walk of the buffer heads covering the page. It was
not intended to be used with a boolean function, such as
ext4_bh_unmapped_or_delay().
Add addtional fix from Aneesh to protect i_disksize update rave with truncate.
Signed-off-by: Mingming Cao <cmm@us.ibm.com>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-07-12 01:27:31 +02:00
|
|
|
|
2009-06-17 17:48:11 +02:00
|
|
|
trace_ext4_da_write_end(inode, pos, len, copied);
|
ext4: fix delalloc i_disksize early update issue
Ext4_da_write_end() used walk_page_buffers() with a callback function of
ext4_bh_unmapped_or_delay() to check if it extended the file size
without allocating any blocks (since in this case i_disksize needs to be
updated). However, this is didn't work proprely because the buffer head
has not been marked dirty yet --- this is done later in
block_commit_write() --- which caused ext4_bh_unmapped_or_delay() to
always return false.
In addition, walk_page_buffers() checks all of the buffer heads covering
the page, and the only buffer_head that should be checked is the one
covering the end of the write. Otherwise, given a 1k blocksize
filesystem and a 4k page size, the buffer head covering the first 1k
stripe of the file could be unmapped (because it was a sparse file), and
the second or third buffer_head covering that page could be mapped, and
using walk_page_buffers() would fail in this case since it would stop at
the first unmapped buffer_head and return true.
The core problem is that walk_page_buffers() was intended to do work in
a callback function, and a non-zero return value indicated a failure,
which termined the walk of the buffer heads covering the page. It was
not intended to be used with a boolean function, such as
ext4_bh_unmapped_or_delay().
Add addtional fix from Aneesh to protect i_disksize update rave with truncate.
Signed-off-by: Mingming Cao <cmm@us.ibm.com>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-07-12 01:27:31 +02:00
|
|
|
start = pos & (PAGE_CACHE_SIZE - 1);
|
2008-09-09 04:25:24 +02:00
|
|
|
end = start + copied - 1;
|
2008-07-12 01:27:31 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
* generic_write_end() will run mark_inode_dirty() if i_size
|
|
|
|
* changes. So let's piggyback the i_disksize mark_inode_dirty
|
|
|
|
* into that.
|
|
|
|
*/
|
|
|
|
|
|
|
|
new_i_size = pos + copied;
|
ext4: fix delalloc i_disksize early update issue
Ext4_da_write_end() used walk_page_buffers() with a callback function of
ext4_bh_unmapped_or_delay() to check if it extended the file size
without allocating any blocks (since in this case i_disksize needs to be
updated). However, this is didn't work proprely because the buffer head
has not been marked dirty yet --- this is done later in
block_commit_write() --- which caused ext4_bh_unmapped_or_delay() to
always return false.
In addition, walk_page_buffers() checks all of the buffer heads covering
the page, and the only buffer_head that should be checked is the one
covering the end of the write. Otherwise, given a 1k blocksize
filesystem and a 4k page size, the buffer head covering the first 1k
stripe of the file could be unmapped (because it was a sparse file), and
the second or third buffer_head covering that page could be mapped, and
using walk_page_buffers() would fail in this case since it would stop at
the first unmapped buffer_head and return true.
The core problem is that walk_page_buffers() was intended to do work in
a callback function, and a non-zero return value indicated a failure,
which termined the walk of the buffer heads covering the page. It was
not intended to be used with a boolean function, such as
ext4_bh_unmapped_or_delay().
Add addtional fix from Aneesh to protect i_disksize update rave with truncate.
Signed-off-by: Mingming Cao <cmm@us.ibm.com>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-07-12 01:27:31 +02:00
|
|
|
if (new_i_size > EXT4_I(inode)->i_disksize) {
|
|
|
|
if (ext4_da_should_update_i_disksize(page, end)) {
|
|
|
|
down_write(&EXT4_I(inode)->i_data_sem);
|
|
|
|
if (new_i_size > EXT4_I(inode)->i_disksize) {
|
|
|
|
/*
|
|
|
|
* Updating i_disksize when extending file
|
|
|
|
* without needing block allocation
|
|
|
|
*/
|
|
|
|
if (ext4_should_order_data(inode))
|
|
|
|
ret = ext4_jbd2_file_inode(handle,
|
|
|
|
inode);
|
2008-07-12 01:27:31 +02:00
|
|
|
|
ext4: fix delalloc i_disksize early update issue
Ext4_da_write_end() used walk_page_buffers() with a callback function of
ext4_bh_unmapped_or_delay() to check if it extended the file size
without allocating any blocks (since in this case i_disksize needs to be
updated). However, this is didn't work proprely because the buffer head
has not been marked dirty yet --- this is done later in
block_commit_write() --- which caused ext4_bh_unmapped_or_delay() to
always return false.
In addition, walk_page_buffers() checks all of the buffer heads covering
the page, and the only buffer_head that should be checked is the one
covering the end of the write. Otherwise, given a 1k blocksize
filesystem and a 4k page size, the buffer head covering the first 1k
stripe of the file could be unmapped (because it was a sparse file), and
the second or third buffer_head covering that page could be mapped, and
using walk_page_buffers() would fail in this case since it would stop at
the first unmapped buffer_head and return true.
The core problem is that walk_page_buffers() was intended to do work in
a callback function, and a non-zero return value indicated a failure,
which termined the walk of the buffer heads covering the page. It was
not intended to be used with a boolean function, such as
ext4_bh_unmapped_or_delay().
Add addtional fix from Aneesh to protect i_disksize update rave with truncate.
Signed-off-by: Mingming Cao <cmm@us.ibm.com>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-07-12 01:27:31 +02:00
|
|
|
EXT4_I(inode)->i_disksize = new_i_size;
|
|
|
|
}
|
|
|
|
up_write(&EXT4_I(inode)->i_data_sem);
|
2008-09-13 19:06:18 +02:00
|
|
|
/* We need to mark inode dirty even if
|
|
|
|
* new_i_size is less that inode->i_size
|
|
|
|
* bu greater than i_disksize.(hint delalloc)
|
|
|
|
*/
|
|
|
|
ext4_mark_inode_dirty(handle, inode);
|
2008-07-12 01:27:31 +02:00
|
|
|
}
|
ext4: fix delalloc i_disksize early update issue
Ext4_da_write_end() used walk_page_buffers() with a callback function of
ext4_bh_unmapped_or_delay() to check if it extended the file size
without allocating any blocks (since in this case i_disksize needs to be
updated). However, this is didn't work proprely because the buffer head
has not been marked dirty yet --- this is done later in
block_commit_write() --- which caused ext4_bh_unmapped_or_delay() to
always return false.
In addition, walk_page_buffers() checks all of the buffer heads covering
the page, and the only buffer_head that should be checked is the one
covering the end of the write. Otherwise, given a 1k blocksize
filesystem and a 4k page size, the buffer head covering the first 1k
stripe of the file could be unmapped (because it was a sparse file), and
the second or third buffer_head covering that page could be mapped, and
using walk_page_buffers() would fail in this case since it would stop at
the first unmapped buffer_head and return true.
The core problem is that walk_page_buffers() was intended to do work in
a callback function, and a non-zero return value indicated a failure,
which termined the walk of the buffer heads covering the page. It was
not intended to be used with a boolean function, such as
ext4_bh_unmapped_or_delay().
Add addtional fix from Aneesh to protect i_disksize update rave with truncate.
Signed-off-by: Mingming Cao <cmm@us.ibm.com>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-07-12 01:27:31 +02:00
|
|
|
}
|
2008-07-12 01:27:31 +02:00
|
|
|
ret2 = generic_write_end(file, mapping, pos, len, copied,
|
|
|
|
page, fsdata);
|
2011-09-07 03:53:01 +02:00
|
|
|
|
|
|
|
page_len = PAGE_CACHE_SIZE -
|
|
|
|
((pos + copied - 1) & (PAGE_CACHE_SIZE - 1));
|
|
|
|
|
|
|
|
if (page_len > 0) {
|
|
|
|
ret = ext4_discard_partial_page_buffers_no_lock(handle,
|
|
|
|
inode, page, pos + copied - 1, page_len,
|
|
|
|
EXT4_DISCARD_PARTIAL_PG_ZERO_UNMAPPED);
|
|
|
|
}
|
|
|
|
|
2008-07-12 01:27:31 +02:00
|
|
|
copied = ret2;
|
|
|
|
if (ret2 < 0)
|
|
|
|
ret = ret2;
|
|
|
|
ret2 = ext4_journal_stop(handle);
|
|
|
|
if (!ret)
|
|
|
|
ret = ret2;
|
|
|
|
|
|
|
|
return ret ? ret : copied;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void ext4_da_invalidatepage(struct page *page, unsigned long offset)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
* Drop reserved blocks
|
|
|
|
*/
|
|
|
|
BUG_ON(!PageLocked(page));
|
|
|
|
if (!page_has_buffers(page))
|
|
|
|
goto out;
|
|
|
|
|
2008-07-14 23:52:37 +02:00
|
|
|
ext4_da_page_release_reservation(page, offset);
|
2008-07-12 01:27:31 +02:00
|
|
|
|
|
|
|
out:
|
|
|
|
ext4_invalidatepage(page, offset);
|
|
|
|
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2009-02-26 07:04:07 +01:00
|
|
|
/*
|
|
|
|
* Force all delayed allocation blocks to be allocated for a given inode.
|
|
|
|
*/
|
|
|
|
int ext4_alloc_da_blocks(struct inode *inode)
|
|
|
|
{
|
2009-09-17 01:30:40 +02:00
|
|
|
trace_ext4_alloc_da_blocks(inode);
|
|
|
|
|
2009-02-26 07:04:07 +01:00
|
|
|
if (!EXT4_I(inode)->i_reserved_data_blocks &&
|
|
|
|
!EXT4_I(inode)->i_reserved_meta_blocks)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* We do something simple for now. The filemap_flush() will
|
|
|
|
* also start triggering a write of the data blocks, which is
|
|
|
|
* not strictly speaking necessary (and for users of
|
|
|
|
* laptop_mode, not even desirable). However, to do otherwise
|
|
|
|
* would require replicating code paths in:
|
2009-06-14 23:45:34 +02:00
|
|
|
*
|
2009-02-26 07:04:07 +01:00
|
|
|
* ext4_da_writepages() ->
|
|
|
|
* write_cache_pages() ---> (via passed in callback function)
|
|
|
|
* __mpage_da_writepage() -->
|
|
|
|
* mpage_add_bh_to_extent()
|
|
|
|
* mpage_da_map_blocks()
|
|
|
|
*
|
|
|
|
* The problem is that write_cache_pages(), located in
|
|
|
|
* mm/page-writeback.c, marks pages clean in preparation for
|
|
|
|
* doing I/O, which is not desirable if we're not planning on
|
|
|
|
* doing I/O at all.
|
|
|
|
*
|
|
|
|
* We could call write_cache_pages(), and then redirty all of
|
2010-11-11 12:23:29 +01:00
|
|
|
* the pages by calling redirty_page_for_writepage() but that
|
2009-02-26 07:04:07 +01:00
|
|
|
* would be ugly in the extreme. So instead we would need to
|
|
|
|
* replicate parts of the code in the above functions,
|
2011-03-31 03:57:33 +02:00
|
|
|
* simplifying them because we wouldn't actually intend to
|
2009-02-26 07:04:07 +01:00
|
|
|
* write out the pages, but rather only collect contiguous
|
|
|
|
* logical block extents, call the multi-block allocator, and
|
|
|
|
* then update the buffer heads with the block allocations.
|
2009-06-14 23:45:34 +02:00
|
|
|
*
|
2009-02-26 07:04:07 +01:00
|
|
|
* For now, though, we'll cheat by calling filemap_flush(),
|
|
|
|
* which will map the blocks, and start the I/O, but not
|
|
|
|
* actually wait for the I/O to complete.
|
|
|
|
*/
|
|
|
|
return filemap_flush(inode->i_mapping);
|
|
|
|
}
|
2008-07-12 01:27:31 +02:00
|
|
|
|
2006-10-11 10:20:50 +02:00
|
|
|
/*
|
|
|
|
* bmap() is special. It gets used by applications such as lilo and by
|
|
|
|
* the swapper to find the on-disk block of a specific piece of data.
|
|
|
|
*
|
|
|
|
* Naturally, this is dangerous if the block concerned is still in the
|
2006-10-11 10:20:53 +02:00
|
|
|
* journal. If somebody makes a swapfile on an ext4 data-journaling
|
2006-10-11 10:20:50 +02:00
|
|
|
* filesystem and enables swap, then they may get a nasty shock when the
|
|
|
|
* data getting swapped to that swapfile suddenly gets overwritten by
|
|
|
|
* the original zero's written out previously to the journal and
|
|
|
|
* awaiting writeback in the kernel's buffer cache.
|
|
|
|
*
|
|
|
|
* So, if we see any bmap calls here on a modified, data-journaled file,
|
|
|
|
* take extra steps to flush any blocks which might be in the cache.
|
|
|
|
*/
|
2006-10-11 10:20:53 +02:00
|
|
|
static sector_t ext4_bmap(struct address_space *mapping, sector_t block)
|
2006-10-11 10:20:50 +02:00
|
|
|
{
|
|
|
|
struct inode *inode = mapping->host;
|
|
|
|
journal_t *journal;
|
|
|
|
int err;
|
|
|
|
|
2008-07-12 01:27:31 +02:00
|
|
|
if (mapping_tagged(mapping, PAGECACHE_TAG_DIRTY) &&
|
|
|
|
test_opt(inode->i_sb, DELALLOC)) {
|
|
|
|
/*
|
|
|
|
* With delalloc we want to sync the file
|
|
|
|
* so that we can make sure we allocate
|
|
|
|
* blocks for file
|
|
|
|
*/
|
|
|
|
filemap_write_and_wait(mapping);
|
|
|
|
}
|
|
|
|
|
2010-01-24 20:34:07 +01:00
|
|
|
if (EXT4_JOURNAL(inode) &&
|
|
|
|
ext4_test_inode_state(inode, EXT4_STATE_JDATA)) {
|
2006-10-11 10:20:50 +02:00
|
|
|
/*
|
|
|
|
* This is a REALLY heavyweight approach, but the use of
|
|
|
|
* bmap on dirty files is expected to be extremely rare:
|
|
|
|
* only if we run lilo or swapon on a freshly made file
|
|
|
|
* do we expect this to happen.
|
|
|
|
*
|
|
|
|
* (bmap requires CAP_SYS_RAWIO so this does not
|
|
|
|
* represent an unprivileged user DOS attack --- we'd be
|
|
|
|
* in trouble if mortal users could trigger this path at
|
|
|
|
* will.)
|
|
|
|
*
|
2006-10-11 10:20:53 +02:00
|
|
|
* NB. EXT4_STATE_JDATA is not set on files other than
|
2006-10-11 10:20:50 +02:00
|
|
|
* regular files. If somebody wants to bmap a directory
|
|
|
|
* or symlink and gets confused because the buffer
|
|
|
|
* hasn't yet been flushed to disk, they deserve
|
|
|
|
* everything they get.
|
|
|
|
*/
|
|
|
|
|
2010-01-24 20:34:07 +01:00
|
|
|
ext4_clear_inode_state(inode, EXT4_STATE_JDATA);
|
2006-10-11 10:20:53 +02:00
|
|
|
journal = EXT4_JOURNAL(inode);
|
2006-10-11 10:21:01 +02:00
|
|
|
jbd2_journal_lock_updates(journal);
|
|
|
|
err = jbd2_journal_flush(journal);
|
|
|
|
jbd2_journal_unlock_updates(journal);
|
2006-10-11 10:20:50 +02:00
|
|
|
|
|
|
|
if (err)
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2008-09-09 04:25:24 +02:00
|
|
|
return generic_block_bmap(mapping, block, ext4_get_block);
|
2006-10-11 10:20:50 +02:00
|
|
|
}
|
|
|
|
|
2006-10-11 10:20:53 +02:00
|
|
|
static int ext4_readpage(struct file *file, struct page *page)
|
2006-10-11 10:20:50 +02:00
|
|
|
{
|
2011-03-22 02:38:05 +01:00
|
|
|
trace_ext4_readpage(page);
|
2006-10-11 10:20:53 +02:00
|
|
|
return mpage_readpage(page, ext4_get_block);
|
2006-10-11 10:20:50 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2006-10-11 10:20:53 +02:00
|
|
|
ext4_readpages(struct file *file, struct address_space *mapping,
|
2006-10-11 10:20:50 +02:00
|
|
|
struct list_head *pages, unsigned nr_pages)
|
|
|
|
{
|
2006-10-11 10:20:53 +02:00
|
|
|
return mpage_readpages(mapping, pages, nr_pages, ext4_get_block);
|
2006-10-11 10:20:50 +02:00
|
|
|
}
|
|
|
|
|
2010-03-04 22:14:02 +01:00
|
|
|
static void ext4_invalidatepage_free_endio(struct page *page, unsigned long offset)
|
|
|
|
{
|
|
|
|
struct buffer_head *head, *bh;
|
|
|
|
unsigned int curr_off = 0;
|
|
|
|
|
|
|
|
if (!page_has_buffers(page))
|
|
|
|
return;
|
|
|
|
head = bh = page_buffers(page);
|
|
|
|
do {
|
|
|
|
if (offset <= curr_off && test_clear_buffer_uninit(bh)
|
|
|
|
&& bh->b_private) {
|
|
|
|
ext4_free_io_end(bh->b_private);
|
|
|
|
bh->b_private = NULL;
|
|
|
|
bh->b_end_io = NULL;
|
|
|
|
}
|
|
|
|
curr_off = curr_off + bh->b_size;
|
|
|
|
bh = bh->b_this_page;
|
|
|
|
} while (bh != head);
|
|
|
|
}
|
|
|
|
|
2006-10-11 10:20:53 +02:00
|
|
|
static void ext4_invalidatepage(struct page *page, unsigned long offset)
|
2006-10-11 10:20:50 +02:00
|
|
|
{
|
2006-10-11 10:20:53 +02:00
|
|
|
journal_t *journal = EXT4_JOURNAL(page->mapping->host);
|
2006-10-11 10:20:50 +02:00
|
|
|
|
2011-03-22 02:38:05 +01:00
|
|
|
trace_ext4_invalidatepage(page, offset);
|
|
|
|
|
2010-03-04 22:14:02 +01:00
|
|
|
/*
|
|
|
|
* free any io_end structure allocated for buffers to be discarded
|
|
|
|
*/
|
|
|
|
if (ext4_should_dioread_nolock(page->mapping->host))
|
|
|
|
ext4_invalidatepage_free_endio(page, offset);
|
2006-10-11 10:20:50 +02:00
|
|
|
/*
|
|
|
|
* If it's a full truncate we just forget about the pending dirtying
|
|
|
|
*/
|
|
|
|
if (offset == 0)
|
|
|
|
ClearPageChecked(page);
|
|
|
|
|
2009-01-07 06:06:22 +01:00
|
|
|
if (journal)
|
|
|
|
jbd2_journal_invalidatepage(journal, page, offset);
|
|
|
|
else
|
|
|
|
block_invalidatepage(page, offset);
|
2006-10-11 10:20:50 +02:00
|
|
|
}
|
|
|
|
|
2006-10-11 10:20:53 +02:00
|
|
|
static int ext4_releasepage(struct page *page, gfp_t wait)
|
2006-10-11 10:20:50 +02:00
|
|
|
{
|
2006-10-11 10:20:53 +02:00
|
|
|
journal_t *journal = EXT4_JOURNAL(page->mapping->host);
|
2006-10-11 10:20:50 +02:00
|
|
|
|
2011-03-22 02:38:05 +01:00
|
|
|
trace_ext4_releasepage(page);
|
|
|
|
|
2006-10-11 10:20:50 +02:00
|
|
|
WARN_ON(PageChecked(page));
|
|
|
|
if (!page_has_buffers(page))
|
|
|
|
return 0;
|
2009-01-07 06:06:22 +01:00
|
|
|
if (journal)
|
|
|
|
return jbd2_journal_try_to_free_buffers(journal, page, wait);
|
|
|
|
else
|
|
|
|
return try_to_free_buffers(page);
|
2006-10-11 10:20:50 +02:00
|
|
|
}
|
|
|
|
|
2010-05-17 02:00:00 +02:00
|
|
|
/*
|
|
|
|
* ext4_get_block used when preparing for a DIO write or buffer write.
|
|
|
|
* We allocate an uinitialized extent if blocks haven't been allocated.
|
|
|
|
* The extent will be converted to initialized after the IO is complete.
|
|
|
|
*/
|
2010-03-02 19:28:44 +01:00
|
|
|
static int ext4_get_block_write(struct inode *inode, sector_t iblock,
|
2009-09-28 21:48:41 +02:00
|
|
|
struct buffer_head *bh_result, int create)
|
|
|
|
{
|
2010-03-02 19:28:44 +01:00
|
|
|
ext4_debug("ext4_get_block_write: inode %lu, create flag %d\n",
|
2009-09-28 21:48:29 +02:00
|
|
|
inode->i_ino, create);
|
2010-05-17 02:00:00 +02:00
|
|
|
return _ext4_get_block(inode, iblock, bh_result,
|
|
|
|
EXT4_GET_BLOCKS_IO_CREATE_EXT);
|
2009-09-28 21:48:41 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static void ext4_end_io_dio(struct kiocb *iocb, loff_t offset,
|
2010-07-27 17:56:06 +02:00
|
|
|
ssize_t size, void *private, int ret,
|
|
|
|
bool is_async)
|
2009-09-28 21:48:41 +02:00
|
|
|
{
|
2011-06-24 20:29:48 +02:00
|
|
|
struct inode *inode = iocb->ki_filp->f_path.dentry->d_inode;
|
2009-09-28 21:48:41 +02:00
|
|
|
ext4_io_end_t *io_end = iocb->private;
|
|
|
|
struct workqueue_struct *wq;
|
2010-03-04 22:14:02 +01:00
|
|
|
unsigned long flags;
|
|
|
|
struct ext4_inode_info *ei;
|
2009-09-28 21:48:41 +02:00
|
|
|
|
2009-11-03 20:44:54 +01:00
|
|
|
/* if not async direct IO or dio with 0 bytes write, just return */
|
|
|
|
if (!io_end || !size)
|
2010-07-27 17:56:06 +02:00
|
|
|
goto out;
|
2009-11-03 20:44:54 +01:00
|
|
|
|
2009-09-28 21:48:29 +02:00
|
|
|
ext_debug("ext4_end_io_dio(): io_end 0x%p"
|
|
|
|
"for inode %lu, iocb 0x%p, offset %llu, size %llu\n",
|
|
|
|
iocb->private, io_end->inode->i_ino, iocb, offset,
|
|
|
|
size);
|
|
|
|
|
|
|
|
/* if not aio dio with unwritten extents, just free io and return */
|
2010-10-28 03:30:10 +02:00
|
|
|
if (!(io_end->flag & EXT4_IO_END_UNWRITTEN)) {
|
2009-09-28 21:48:29 +02:00
|
|
|
ext4_free_io_end(io_end);
|
|
|
|
iocb->private = NULL;
|
2010-07-27 17:56:06 +02:00
|
|
|
out:
|
|
|
|
if (is_async)
|
|
|
|
aio_complete(iocb, ret, 0);
|
2011-06-24 20:29:48 +02:00
|
|
|
inode_dio_done(inode);
|
2010-07-27 17:56:06 +02:00
|
|
|
return;
|
2009-09-28 21:48:29 +02:00
|
|
|
}
|
|
|
|
|
2009-09-28 21:48:41 +02:00
|
|
|
io_end->offset = offset;
|
|
|
|
io_end->size = size;
|
2010-07-27 17:56:06 +02:00
|
|
|
if (is_async) {
|
|
|
|
io_end->iocb = iocb;
|
|
|
|
io_end->result = ret;
|
|
|
|
}
|
2009-09-28 21:48:41 +02:00
|
|
|
wq = EXT4_SB(io_end->inode->i_sb)->dio_unwritten_wq;
|
|
|
|
|
2009-09-28 21:48:29 +02:00
|
|
|
/* Add the io_end to per-inode completed aio dio list*/
|
2010-03-04 22:14:02 +01:00
|
|
|
ei = EXT4_I(io_end->inode);
|
|
|
|
spin_lock_irqsave(&ei->i_completed_io_lock, flags);
|
|
|
|
list_add_tail(&io_end->list, &ei->i_completed_io_list);
|
|
|
|
spin_unlock_irqrestore(&ei->i_completed_io_lock, flags);
|
2010-10-28 03:30:07 +02:00
|
|
|
|
|
|
|
/* queue the work to convert unwritten extents to written */
|
|
|
|
queue_work(wq, &io_end->work);
|
2009-09-28 21:48:41 +02:00
|
|
|
iocb->private = NULL;
|
2011-06-24 20:29:48 +02:00
|
|
|
|
|
|
|
/* XXX: probably should move into the real I/O completion handler */
|
|
|
|
inode_dio_done(inode);
|
2009-09-28 21:48:41 +02:00
|
|
|
}
|
2010-03-02 19:28:44 +01:00
|
|
|
|
2010-03-04 22:14:02 +01:00
|
|
|
static void ext4_end_io_buffer_write(struct buffer_head *bh, int uptodate)
|
|
|
|
{
|
|
|
|
ext4_io_end_t *io_end = bh->b_private;
|
|
|
|
struct workqueue_struct *wq;
|
|
|
|
struct inode *inode;
|
|
|
|
unsigned long flags;
|
|
|
|
|
|
|
|
if (!test_clear_buffer_uninit(bh) || !io_end)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
if (!(io_end->inode->i_sb->s_flags & MS_ACTIVE)) {
|
|
|
|
printk("sb umounted, discard end_io request for inode %lu\n",
|
|
|
|
io_end->inode->i_ino);
|
|
|
|
ext4_free_io_end(io_end);
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2011-08-13 18:30:59 +02:00
|
|
|
/*
|
|
|
|
* It may be over-defensive here to check EXT4_IO_END_UNWRITTEN now,
|
|
|
|
* but being more careful is always safe for the future change.
|
|
|
|
*/
|
2010-03-04 22:14:02 +01:00
|
|
|
inode = io_end->inode;
|
2011-08-13 18:30:59 +02:00
|
|
|
if (!(io_end->flag & EXT4_IO_END_UNWRITTEN)) {
|
|
|
|
io_end->flag |= EXT4_IO_END_UNWRITTEN;
|
|
|
|
atomic_inc(&EXT4_I(inode)->i_aiodio_unwritten);
|
|
|
|
}
|
2010-03-04 22:14:02 +01:00
|
|
|
|
|
|
|
/* Add the io_end to per-inode completed io list*/
|
|
|
|
spin_lock_irqsave(&EXT4_I(inode)->i_completed_io_lock, flags);
|
|
|
|
list_add_tail(&io_end->list, &EXT4_I(inode)->i_completed_io_list);
|
|
|
|
spin_unlock_irqrestore(&EXT4_I(inode)->i_completed_io_lock, flags);
|
|
|
|
|
|
|
|
wq = EXT4_SB(inode->i_sb)->dio_unwritten_wq;
|
|
|
|
/* queue the work to convert unwritten extents to written */
|
|
|
|
queue_work(wq, &io_end->work);
|
|
|
|
out:
|
|
|
|
bh->b_private = NULL;
|
|
|
|
bh->b_end_io = NULL;
|
|
|
|
clear_buffer_uninit(bh);
|
|
|
|
end_buffer_async_write(bh, uptodate);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int ext4_set_bh_endio(struct buffer_head *bh, struct inode *inode)
|
|
|
|
{
|
|
|
|
ext4_io_end_t *io_end;
|
|
|
|
struct page *page = bh->b_page;
|
|
|
|
loff_t offset = (sector_t)page->index << PAGE_CACHE_SHIFT;
|
|
|
|
size_t size = bh->b_size;
|
|
|
|
|
|
|
|
retry:
|
|
|
|
io_end = ext4_init_io_end(inode, GFP_ATOMIC);
|
|
|
|
if (!io_end) {
|
2011-01-13 01:59:13 +01:00
|
|
|
pr_warn_ratelimited("%s: allocation fail\n", __func__);
|
2010-03-04 22:14:02 +01:00
|
|
|
schedule();
|
|
|
|
goto retry;
|
|
|
|
}
|
|
|
|
io_end->offset = offset;
|
|
|
|
io_end->size = size;
|
|
|
|
/*
|
|
|
|
* We need to hold a reference to the page to make sure it
|
|
|
|
* doesn't get evicted before ext4_end_io_work() has a chance
|
|
|
|
* to convert the extent from written to unwritten.
|
|
|
|
*/
|
|
|
|
io_end->page = page;
|
|
|
|
get_page(io_end->page);
|
|
|
|
|
|
|
|
bh->b_private = io_end;
|
|
|
|
bh->b_end_io = ext4_end_io_buffer_write;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2009-09-28 21:48:41 +02:00
|
|
|
/*
|
|
|
|
* For ext4 extent files, ext4 will do direct-io write to holes,
|
|
|
|
* preallocated extents, and those write extend the file, no need to
|
|
|
|
* fall back to buffered IO.
|
|
|
|
*
|
tree-wide: fix comment/printk typos
"gadget", "through", "command", "maintain", "maintain", "controller", "address",
"between", "initiali[zs]e", "instead", "function", "select", "already",
"equal", "access", "management", "hierarchy", "registration", "interest",
"relative", "memory", "offset", "already",
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
2010-11-01 20:38:34 +01:00
|
|
|
* For holes, we fallocate those blocks, mark them as uninitialized
|
2009-09-28 21:48:41 +02:00
|
|
|
* If those blocks were preallocated, we mark sure they are splited, but
|
tree-wide: fix comment/printk typos
"gadget", "through", "command", "maintain", "maintain", "controller", "address",
"between", "initiali[zs]e", "instead", "function", "select", "already",
"equal", "access", "management", "hierarchy", "registration", "interest",
"relative", "memory", "offset", "already",
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
2010-11-01 20:38:34 +01:00
|
|
|
* still keep the range to write as uninitialized.
|
2009-09-28 21:48:41 +02:00
|
|
|
*
|
2009-09-28 21:48:29 +02:00
|
|
|
* The unwrritten extents will be converted to written when DIO is completed.
|
|
|
|
* For async direct IO, since the IO may still pending when return, we
|
2011-03-31 03:57:33 +02:00
|
|
|
* set up an end_io call back function, which will do the conversion
|
2009-09-28 21:48:29 +02:00
|
|
|
* when async direct IO completed.
|
2009-09-28 21:48:41 +02:00
|
|
|
*
|
|
|
|
* If the O_DIRECT write will extend the file then add this inode to the
|
|
|
|
* orphan list. So recovery will truncate it back to the original size
|
|
|
|
* if the machine crashes during the write.
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
static ssize_t ext4_ext_direct_IO(int rw, struct kiocb *iocb,
|
|
|
|
const struct iovec *iov, loff_t offset,
|
|
|
|
unsigned long nr_segs)
|
|
|
|
{
|
|
|
|
struct file *file = iocb->ki_filp;
|
|
|
|
struct inode *inode = file->f_mapping->host;
|
|
|
|
ssize_t ret;
|
|
|
|
size_t count = iov_length(iov, nr_segs);
|
|
|
|
|
|
|
|
loff_t final_size = offset + count;
|
|
|
|
if (rw == WRITE && final_size <= inode->i_size) {
|
|
|
|
/*
|
2009-09-28 21:48:29 +02:00
|
|
|
* We could direct write to holes and fallocate.
|
|
|
|
*
|
|
|
|
* Allocated blocks to fill the hole are marked as uninitialized
|
2011-03-31 03:57:33 +02:00
|
|
|
* to prevent parallel buffered read to expose the stale data
|
2009-09-28 21:48:41 +02:00
|
|
|
* before DIO complete the data IO.
|
2009-09-28 21:48:29 +02:00
|
|
|
*
|
|
|
|
* As to previously fallocated extents, ext4 get_block
|
2009-09-28 21:48:41 +02:00
|
|
|
* will just simply mark the buffer mapped but still
|
|
|
|
* keep the extents uninitialized.
|
|
|
|
*
|
2009-09-28 21:48:29 +02:00
|
|
|
* for non AIO case, we will convert those unwritten extents
|
|
|
|
* to written after return back from blockdev_direct_IO.
|
|
|
|
*
|
|
|
|
* for async DIO, the conversion needs to be defered when
|
|
|
|
* the IO is completed. The ext4 end_io callback function
|
|
|
|
* will be called to take care of the conversion work.
|
|
|
|
* Here for async case, we allocate an io_end structure to
|
|
|
|
* hook to the iocb.
|
2009-09-28 21:48:41 +02:00
|
|
|
*/
|
2009-09-28 21:48:29 +02:00
|
|
|
iocb->private = NULL;
|
|
|
|
EXT4_I(inode)->cur_aio_dio = NULL;
|
|
|
|
if (!is_sync_kiocb(iocb)) {
|
2010-03-04 22:14:02 +01:00
|
|
|
iocb->private = ext4_init_io_end(inode, GFP_NOFS);
|
2009-09-28 21:48:29 +02:00
|
|
|
if (!iocb->private)
|
|
|
|
return -ENOMEM;
|
|
|
|
/*
|
|
|
|
* we save the io structure for current async
|
2010-07-27 17:56:07 +02:00
|
|
|
* direct IO, so that later ext4_map_blocks()
|
2009-09-28 21:48:29 +02:00
|
|
|
* could flag the io structure whether there
|
|
|
|
* is a unwritten extents needs to be converted
|
|
|
|
* when IO is completed.
|
|
|
|
*/
|
|
|
|
EXT4_I(inode)->cur_aio_dio = iocb->private;
|
|
|
|
}
|
|
|
|
|
2011-06-24 20:29:47 +02:00
|
|
|
ret = __blockdev_direct_IO(rw, iocb, inode,
|
2009-09-28 21:48:41 +02:00
|
|
|
inode->i_sb->s_bdev, iov,
|
|
|
|
offset, nr_segs,
|
2010-03-02 19:28:44 +01:00
|
|
|
ext4_get_block_write,
|
2011-06-24 20:29:47 +02:00
|
|
|
ext4_end_io_dio,
|
|
|
|
NULL,
|
|
|
|
DIO_LOCKING | DIO_SKIP_HOLES);
|
2009-09-28 21:48:29 +02:00
|
|
|
if (iocb->private)
|
|
|
|
EXT4_I(inode)->cur_aio_dio = NULL;
|
|
|
|
/*
|
|
|
|
* The io_end structure takes a reference to the inode,
|
|
|
|
* that structure needs to be destroyed and the
|
|
|
|
* reference to the inode need to be dropped, when IO is
|
|
|
|
* complete, even with 0 byte write, or failed.
|
|
|
|
*
|
|
|
|
* In the successful AIO DIO case, the io_end structure will be
|
|
|
|
* desctroyed and the reference to the inode will be dropped
|
|
|
|
* after the end_io call back function is called.
|
|
|
|
*
|
|
|
|
* In the case there is 0 byte write, or error case, since
|
|
|
|
* VFS direct IO won't invoke the end_io call back function,
|
|
|
|
* we need to free the end_io structure here.
|
|
|
|
*/
|
|
|
|
if (ret != -EIOCBQUEUED && ret <= 0 && iocb->private) {
|
|
|
|
ext4_free_io_end(iocb->private);
|
|
|
|
iocb->private = NULL;
|
2010-01-24 20:34:07 +01:00
|
|
|
} else if (ret > 0 && ext4_test_inode_state(inode,
|
|
|
|
EXT4_STATE_DIO_UNWRITTEN)) {
|
2009-11-10 16:48:08 +01:00
|
|
|
int err;
|
2009-09-28 21:48:29 +02:00
|
|
|
/*
|
|
|
|
* for non AIO case, since the IO is already
|
2011-03-31 03:57:33 +02:00
|
|
|
* completed, we could do the conversion right here
|
2009-09-28 21:48:29 +02:00
|
|
|
*/
|
2009-11-10 16:48:08 +01:00
|
|
|
err = ext4_convert_unwritten_extents(inode,
|
|
|
|
offset, ret);
|
|
|
|
if (err < 0)
|
|
|
|
ret = err;
|
2010-01-24 20:34:07 +01:00
|
|
|
ext4_clear_inode_state(inode, EXT4_STATE_DIO_UNWRITTEN);
|
2009-11-10 16:48:08 +01:00
|
|
|
}
|
2009-09-28 21:48:41 +02:00
|
|
|
return ret;
|
|
|
|
}
|
2009-09-28 21:48:29 +02:00
|
|
|
|
|
|
|
/* for write the the end of file case, we fall back to old way */
|
2009-09-28 21:48:41 +02:00
|
|
|
return ext4_ind_direct_IO(rw, iocb, iov, offset, nr_segs);
|
|
|
|
}
|
|
|
|
|
|
|
|
static ssize_t ext4_direct_IO(int rw, struct kiocb *iocb,
|
|
|
|
const struct iovec *iov, loff_t offset,
|
|
|
|
unsigned long nr_segs)
|
|
|
|
{
|
|
|
|
struct file *file = iocb->ki_filp;
|
|
|
|
struct inode *inode = file->f_mapping->host;
|
2011-03-22 02:38:05 +01:00
|
|
|
ssize_t ret;
|
2009-09-28 21:48:41 +02:00
|
|
|
|
2011-08-31 17:56:51 +02:00
|
|
|
/*
|
|
|
|
* If we are doing data journalling we don't support O_DIRECT
|
|
|
|
*/
|
|
|
|
if (ext4_should_journal_data(inode))
|
|
|
|
return 0;
|
|
|
|
|
2011-03-22 02:38:05 +01:00
|
|
|
trace_ext4_direct_IO_enter(inode, offset, iov_length(iov, nr_segs), rw);
|
2010-05-17 04:00:00 +02:00
|
|
|
if (ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS))
|
2011-03-22 02:38:05 +01:00
|
|
|
ret = ext4_ext_direct_IO(rw, iocb, iov, offset, nr_segs);
|
|
|
|
else
|
|
|
|
ret = ext4_ind_direct_IO(rw, iocb, iov, offset, nr_segs);
|
|
|
|
trace_ext4_direct_IO_exit(inode, offset,
|
|
|
|
iov_length(iov, nr_segs), rw, ret);
|
|
|
|
return ret;
|
2009-09-28 21:48:41 +02:00
|
|
|
}
|
|
|
|
|
2006-10-11 10:20:50 +02:00
|
|
|
/*
|
2006-10-11 10:20:53 +02:00
|
|
|
* Pages can be marked dirty completely asynchronously from ext4's journalling
|
2006-10-11 10:20:50 +02:00
|
|
|
* activity. By filemap_sync_pte(), try_to_unmap_one(), etc. We cannot do
|
|
|
|
* much here because ->set_page_dirty is called under VFS locks. The page is
|
|
|
|
* not necessarily locked.
|
|
|
|
*
|
|
|
|
* We cannot just dirty the page and leave attached buffers clean, because the
|
|
|
|
* buffers' dirty state is "definitive". We cannot just set the buffers dirty
|
|
|
|
* or jbddirty because all the journalling code will explode.
|
|
|
|
*
|
|
|
|
* So what we do is to mark the page "pending dirty" and next time writepage
|
|
|
|
* is called, propagate that into the buffers appropriately.
|
|
|
|
*/
|
2006-10-11 10:20:53 +02:00
|
|
|
static int ext4_journalled_set_page_dirty(struct page *page)
|
2006-10-11 10:20:50 +02:00
|
|
|
{
|
|
|
|
SetPageChecked(page);
|
|
|
|
return __set_page_dirty_nobuffers(page);
|
|
|
|
}
|
|
|
|
|
2006-10-11 10:20:53 +02:00
|
|
|
static const struct address_space_operations ext4_ordered_aops = {
|
vfs: pagecache usage optimization for pagesize!=blocksize
When we read some part of a file through pagecache, if there is a
pagecache of corresponding index but this page is not uptodate, read IO
is issued and this page will be uptodate.
I think this is good for pagesize == blocksize environment but there is
room for improvement on pagesize != blocksize environment. Because in
this case a page can have multiple buffers and even if a page is not
uptodate, some buffers can be uptodate.
So I suggest that when all buffers which correspond to a part of a file
that we want to read are uptodate, use this pagecache and copy data from
this pagecache to user buffer even if a page is not uptodate. This can
reduce read IO and improve system throughput.
I wrote a benchmark program and got result number with this program.
This benchmark do:
1: mount and open a test file.
2: create a 512MB file.
3: close a file and umount.
4: mount and again open a test file.
5: pwrite randomly 300000 times on a test file. offset is aligned
by IO size(1024bytes).
6: measure time of preading randomly 100000 times on a test file.
The result was:
2.6.26
330 sec
2.6.26-patched
226 sec
Arch:i386
Filesystem:ext3
Blocksize:1024 bytes
Memory: 1GB
On ext3/4, a file is written through buffer/block. So random read/write
mixed workloads or random read after random write workloads are optimized
with this patch under pagesize != blocksize environment. This test result
showed this.
The benchmark program is as follows:
#include <stdio.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
#include <time.h>
#include <stdlib.h>
#include <string.h>
#include <sys/mount.h>
#define LEN 1024
#define LOOP 1024*512 /* 512MB */
main(void)
{
unsigned long i, offset, filesize;
int fd;
char buf[LEN];
time_t t1, t2;
if (mount("/dev/sda1", "/root/test1/", "ext3", 0, 0) < 0) {
perror("cannot mount\n");
exit(1);
}
memset(buf, 0, LEN);
fd = open("/root/test1/testfile", O_CREAT|O_RDWR|O_TRUNC);
if (fd < 0) {
perror("cannot open file\n");
exit(1);
}
for (i = 0; i < LOOP; i++)
write(fd, buf, LEN);
close(fd);
if (umount("/root/test1/") < 0) {
perror("cannot umount\n");
exit(1);
}
if (mount("/dev/sda1", "/root/test1/", "ext3", 0, 0) < 0) {
perror("cannot mount\n");
exit(1);
}
fd = open("/root/test1/testfile", O_RDWR);
if (fd < 0) {
perror("cannot open file\n");
exit(1);
}
filesize = LEN * LOOP;
for (i = 0; i < 300000; i++){
offset = (random() % filesize) & (~(LEN - 1));
pwrite(fd, buf, LEN, offset);
}
printf("start test\n");
time(&t1);
for (i = 0; i < 100000; i++){
offset = (random() % filesize) & (~(LEN - 1));
pread(fd, buf, LEN, offset);
}
time(&t2);
printf("%ld sec\n", t2-t1);
close(fd);
if (umount("/root/test1/") < 0) {
perror("cannot umount\n");
exit(1);
}
}
Signed-off-by: Hisashi Hifumi <hifumi.hisashi@oss.ntt.co.jp>
Cc: Nick Piggin <nickpiggin@yahoo.com.au>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Jan Kara <jack@ucw.cz>
Cc: <linux-ext4@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2008-07-29 00:46:36 +02:00
|
|
|
.readpage = ext4_readpage,
|
|
|
|
.readpages = ext4_readpages,
|
2009-06-14 23:58:45 +02:00
|
|
|
.writepage = ext4_writepage,
|
vfs: pagecache usage optimization for pagesize!=blocksize
When we read some part of a file through pagecache, if there is a
pagecache of corresponding index but this page is not uptodate, read IO
is issued and this page will be uptodate.
I think this is good for pagesize == blocksize environment but there is
room for improvement on pagesize != blocksize environment. Because in
this case a page can have multiple buffers and even if a page is not
uptodate, some buffers can be uptodate.
So I suggest that when all buffers which correspond to a part of a file
that we want to read are uptodate, use this pagecache and copy data from
this pagecache to user buffer even if a page is not uptodate. This can
reduce read IO and improve system throughput.
I wrote a benchmark program and got result number with this program.
This benchmark do:
1: mount and open a test file.
2: create a 512MB file.
3: close a file and umount.
4: mount and again open a test file.
5: pwrite randomly 300000 times on a test file. offset is aligned
by IO size(1024bytes).
6: measure time of preading randomly 100000 times on a test file.
The result was:
2.6.26
330 sec
2.6.26-patched
226 sec
Arch:i386
Filesystem:ext3
Blocksize:1024 bytes
Memory: 1GB
On ext3/4, a file is written through buffer/block. So random read/write
mixed workloads or random read after random write workloads are optimized
with this patch under pagesize != blocksize environment. This test result
showed this.
The benchmark program is as follows:
#include <stdio.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
#include <time.h>
#include <stdlib.h>
#include <string.h>
#include <sys/mount.h>
#define LEN 1024
#define LOOP 1024*512 /* 512MB */
main(void)
{
unsigned long i, offset, filesize;
int fd;
char buf[LEN];
time_t t1, t2;
if (mount("/dev/sda1", "/root/test1/", "ext3", 0, 0) < 0) {
perror("cannot mount\n");
exit(1);
}
memset(buf, 0, LEN);
fd = open("/root/test1/testfile", O_CREAT|O_RDWR|O_TRUNC);
if (fd < 0) {
perror("cannot open file\n");
exit(1);
}
for (i = 0; i < LOOP; i++)
write(fd, buf, LEN);
close(fd);
if (umount("/root/test1/") < 0) {
perror("cannot umount\n");
exit(1);
}
if (mount("/dev/sda1", "/root/test1/", "ext3", 0, 0) < 0) {
perror("cannot mount\n");
exit(1);
}
fd = open("/root/test1/testfile", O_RDWR);
if (fd < 0) {
perror("cannot open file\n");
exit(1);
}
filesize = LEN * LOOP;
for (i = 0; i < 300000; i++){
offset = (random() % filesize) & (~(LEN - 1));
pwrite(fd, buf, LEN, offset);
}
printf("start test\n");
time(&t1);
for (i = 0; i < 100000; i++){
offset = (random() % filesize) & (~(LEN - 1));
pread(fd, buf, LEN, offset);
}
time(&t2);
printf("%ld sec\n", t2-t1);
close(fd);
if (umount("/root/test1/") < 0) {
perror("cannot umount\n");
exit(1);
}
}
Signed-off-by: Hisashi Hifumi <hifumi.hisashi@oss.ntt.co.jp>
Cc: Nick Piggin <nickpiggin@yahoo.com.au>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Jan Kara <jack@ucw.cz>
Cc: <linux-ext4@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2008-07-29 00:46:36 +02:00
|
|
|
.write_begin = ext4_write_begin,
|
|
|
|
.write_end = ext4_ordered_write_end,
|
|
|
|
.bmap = ext4_bmap,
|
|
|
|
.invalidatepage = ext4_invalidatepage,
|
|
|
|
.releasepage = ext4_releasepage,
|
|
|
|
.direct_IO = ext4_direct_IO,
|
|
|
|
.migratepage = buffer_migrate_page,
|
|
|
|
.is_partially_uptodate = block_is_partially_uptodate,
|
2009-09-16 11:50:16 +02:00
|
|
|
.error_remove_page = generic_error_remove_page,
|
2006-10-11 10:20:50 +02:00
|
|
|
};
|
|
|
|
|
2006-10-11 10:20:53 +02:00
|
|
|
static const struct address_space_operations ext4_writeback_aops = {
|
vfs: pagecache usage optimization for pagesize!=blocksize
When we read some part of a file through pagecache, if there is a
pagecache of corresponding index but this page is not uptodate, read IO
is issued and this page will be uptodate.
I think this is good for pagesize == blocksize environment but there is
room for improvement on pagesize != blocksize environment. Because in
this case a page can have multiple buffers and even if a page is not
uptodate, some buffers can be uptodate.
So I suggest that when all buffers which correspond to a part of a file
that we want to read are uptodate, use this pagecache and copy data from
this pagecache to user buffer even if a page is not uptodate. This can
reduce read IO and improve system throughput.
I wrote a benchmark program and got result number with this program.
This benchmark do:
1: mount and open a test file.
2: create a 512MB file.
3: close a file and umount.
4: mount and again open a test file.
5: pwrite randomly 300000 times on a test file. offset is aligned
by IO size(1024bytes).
6: measure time of preading randomly 100000 times on a test file.
The result was:
2.6.26
330 sec
2.6.26-patched
226 sec
Arch:i386
Filesystem:ext3
Blocksize:1024 bytes
Memory: 1GB
On ext3/4, a file is written through buffer/block. So random read/write
mixed workloads or random read after random write workloads are optimized
with this patch under pagesize != blocksize environment. This test result
showed this.
The benchmark program is as follows:
#include <stdio.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
#include <time.h>
#include <stdlib.h>
#include <string.h>
#include <sys/mount.h>
#define LEN 1024
#define LOOP 1024*512 /* 512MB */
main(void)
{
unsigned long i, offset, filesize;
int fd;
char buf[LEN];
time_t t1, t2;
if (mount("/dev/sda1", "/root/test1/", "ext3", 0, 0) < 0) {
perror("cannot mount\n");
exit(1);
}
memset(buf, 0, LEN);
fd = open("/root/test1/testfile", O_CREAT|O_RDWR|O_TRUNC);
if (fd < 0) {
perror("cannot open file\n");
exit(1);
}
for (i = 0; i < LOOP; i++)
write(fd, buf, LEN);
close(fd);
if (umount("/root/test1/") < 0) {
perror("cannot umount\n");
exit(1);
}
if (mount("/dev/sda1", "/root/test1/", "ext3", 0, 0) < 0) {
perror("cannot mount\n");
exit(1);
}
fd = open("/root/test1/testfile", O_RDWR);
if (fd < 0) {
perror("cannot open file\n");
exit(1);
}
filesize = LEN * LOOP;
for (i = 0; i < 300000; i++){
offset = (random() % filesize) & (~(LEN - 1));
pwrite(fd, buf, LEN, offset);
}
printf("start test\n");
time(&t1);
for (i = 0; i < 100000; i++){
offset = (random() % filesize) & (~(LEN - 1));
pread(fd, buf, LEN, offset);
}
time(&t2);
printf("%ld sec\n", t2-t1);
close(fd);
if (umount("/root/test1/") < 0) {
perror("cannot umount\n");
exit(1);
}
}
Signed-off-by: Hisashi Hifumi <hifumi.hisashi@oss.ntt.co.jp>
Cc: Nick Piggin <nickpiggin@yahoo.com.au>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Jan Kara <jack@ucw.cz>
Cc: <linux-ext4@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2008-07-29 00:46:36 +02:00
|
|
|
.readpage = ext4_readpage,
|
|
|
|
.readpages = ext4_readpages,
|
2009-06-14 23:58:45 +02:00
|
|
|
.writepage = ext4_writepage,
|
vfs: pagecache usage optimization for pagesize!=blocksize
When we read some part of a file through pagecache, if there is a
pagecache of corresponding index but this page is not uptodate, read IO
is issued and this page will be uptodate.
I think this is good for pagesize == blocksize environment but there is
room for improvement on pagesize != blocksize environment. Because in
this case a page can have multiple buffers and even if a page is not
uptodate, some buffers can be uptodate.
So I suggest that when all buffers which correspond to a part of a file
that we want to read are uptodate, use this pagecache and copy data from
this pagecache to user buffer even if a page is not uptodate. This can
reduce read IO and improve system throughput.
I wrote a benchmark program and got result number with this program.
This benchmark do:
1: mount and open a test file.
2: create a 512MB file.
3: close a file and umount.
4: mount and again open a test file.
5: pwrite randomly 300000 times on a test file. offset is aligned
by IO size(1024bytes).
6: measure time of preading randomly 100000 times on a test file.
The result was:
2.6.26
330 sec
2.6.26-patched
226 sec
Arch:i386
Filesystem:ext3
Blocksize:1024 bytes
Memory: 1GB
On ext3/4, a file is written through buffer/block. So random read/write
mixed workloads or random read after random write workloads are optimized
with this patch under pagesize != blocksize environment. This test result
showed this.
The benchmark program is as follows:
#include <stdio.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
#include <time.h>
#include <stdlib.h>
#include <string.h>
#include <sys/mount.h>
#define LEN 1024
#define LOOP 1024*512 /* 512MB */
main(void)
{
unsigned long i, offset, filesize;
int fd;
char buf[LEN];
time_t t1, t2;
if (mount("/dev/sda1", "/root/test1/", "ext3", 0, 0) < 0) {
perror("cannot mount\n");
exit(1);
}
memset(buf, 0, LEN);
fd = open("/root/test1/testfile", O_CREAT|O_RDWR|O_TRUNC);
if (fd < 0) {
perror("cannot open file\n");
exit(1);
}
for (i = 0; i < LOOP; i++)
write(fd, buf, LEN);
close(fd);
if (umount("/root/test1/") < 0) {
perror("cannot umount\n");
exit(1);
}
if (mount("/dev/sda1", "/root/test1/", "ext3", 0, 0) < 0) {
perror("cannot mount\n");
exit(1);
}
fd = open("/root/test1/testfile", O_RDWR);
if (fd < 0) {
perror("cannot open file\n");
exit(1);
}
filesize = LEN * LOOP;
for (i = 0; i < 300000; i++){
offset = (random() % filesize) & (~(LEN - 1));
pwrite(fd, buf, LEN, offset);
}
printf("start test\n");
time(&t1);
for (i = 0; i < 100000; i++){
offset = (random() % filesize) & (~(LEN - 1));
pread(fd, buf, LEN, offset);
}
time(&t2);
printf("%ld sec\n", t2-t1);
close(fd);
if (umount("/root/test1/") < 0) {
perror("cannot umount\n");
exit(1);
}
}
Signed-off-by: Hisashi Hifumi <hifumi.hisashi@oss.ntt.co.jp>
Cc: Nick Piggin <nickpiggin@yahoo.com.au>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Jan Kara <jack@ucw.cz>
Cc: <linux-ext4@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2008-07-29 00:46:36 +02:00
|
|
|
.write_begin = ext4_write_begin,
|
|
|
|
.write_end = ext4_writeback_write_end,
|
|
|
|
.bmap = ext4_bmap,
|
|
|
|
.invalidatepage = ext4_invalidatepage,
|
|
|
|
.releasepage = ext4_releasepage,
|
|
|
|
.direct_IO = ext4_direct_IO,
|
|
|
|
.migratepage = buffer_migrate_page,
|
|
|
|
.is_partially_uptodate = block_is_partially_uptodate,
|
2009-09-16 11:50:16 +02:00
|
|
|
.error_remove_page = generic_error_remove_page,
|
2006-10-11 10:20:50 +02:00
|
|
|
};
|
|
|
|
|
2006-10-11 10:20:53 +02:00
|
|
|
static const struct address_space_operations ext4_journalled_aops = {
|
vfs: pagecache usage optimization for pagesize!=blocksize
When we read some part of a file through pagecache, if there is a
pagecache of corresponding index but this page is not uptodate, read IO
is issued and this page will be uptodate.
I think this is good for pagesize == blocksize environment but there is
room for improvement on pagesize != blocksize environment. Because in
this case a page can have multiple buffers and even if a page is not
uptodate, some buffers can be uptodate.
So I suggest that when all buffers which correspond to a part of a file
that we want to read are uptodate, use this pagecache and copy data from
this pagecache to user buffer even if a page is not uptodate. This can
reduce read IO and improve system throughput.
I wrote a benchmark program and got result number with this program.
This benchmark do:
1: mount and open a test file.
2: create a 512MB file.
3: close a file and umount.
4: mount and again open a test file.
5: pwrite randomly 300000 times on a test file. offset is aligned
by IO size(1024bytes).
6: measure time of preading randomly 100000 times on a test file.
The result was:
2.6.26
330 sec
2.6.26-patched
226 sec
Arch:i386
Filesystem:ext3
Blocksize:1024 bytes
Memory: 1GB
On ext3/4, a file is written through buffer/block. So random read/write
mixed workloads or random read after random write workloads are optimized
with this patch under pagesize != blocksize environment. This test result
showed this.
The benchmark program is as follows:
#include <stdio.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
#include <time.h>
#include <stdlib.h>
#include <string.h>
#include <sys/mount.h>
#define LEN 1024
#define LOOP 1024*512 /* 512MB */
main(void)
{
unsigned long i, offset, filesize;
int fd;
char buf[LEN];
time_t t1, t2;
if (mount("/dev/sda1", "/root/test1/", "ext3", 0, 0) < 0) {
perror("cannot mount\n");
exit(1);
}
memset(buf, 0, LEN);
fd = open("/root/test1/testfile", O_CREAT|O_RDWR|O_TRUNC);
if (fd < 0) {
perror("cannot open file\n");
exit(1);
}
for (i = 0; i < LOOP; i++)
write(fd, buf, LEN);
close(fd);
if (umount("/root/test1/") < 0) {
perror("cannot umount\n");
exit(1);
}
if (mount("/dev/sda1", "/root/test1/", "ext3", 0, 0) < 0) {
perror("cannot mount\n");
exit(1);
}
fd = open("/root/test1/testfile", O_RDWR);
if (fd < 0) {
perror("cannot open file\n");
exit(1);
}
filesize = LEN * LOOP;
for (i = 0; i < 300000; i++){
offset = (random() % filesize) & (~(LEN - 1));
pwrite(fd, buf, LEN, offset);
}
printf("start test\n");
time(&t1);
for (i = 0; i < 100000; i++){
offset = (random() % filesize) & (~(LEN - 1));
pread(fd, buf, LEN, offset);
}
time(&t2);
printf("%ld sec\n", t2-t1);
close(fd);
if (umount("/root/test1/") < 0) {
perror("cannot umount\n");
exit(1);
}
}
Signed-off-by: Hisashi Hifumi <hifumi.hisashi@oss.ntt.co.jp>
Cc: Nick Piggin <nickpiggin@yahoo.com.au>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Jan Kara <jack@ucw.cz>
Cc: <linux-ext4@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2008-07-29 00:46:36 +02:00
|
|
|
.readpage = ext4_readpage,
|
|
|
|
.readpages = ext4_readpages,
|
2009-06-14 23:58:45 +02:00
|
|
|
.writepage = ext4_writepage,
|
vfs: pagecache usage optimization for pagesize!=blocksize
When we read some part of a file through pagecache, if there is a
pagecache of corresponding index but this page is not uptodate, read IO
is issued and this page will be uptodate.
I think this is good for pagesize == blocksize environment but there is
room for improvement on pagesize != blocksize environment. Because in
this case a page can have multiple buffers and even if a page is not
uptodate, some buffers can be uptodate.
So I suggest that when all buffers which correspond to a part of a file
that we want to read are uptodate, use this pagecache and copy data from
this pagecache to user buffer even if a page is not uptodate. This can
reduce read IO and improve system throughput.
I wrote a benchmark program and got result number with this program.
This benchmark do:
1: mount and open a test file.
2: create a 512MB file.
3: close a file and umount.
4: mount and again open a test file.
5: pwrite randomly 300000 times on a test file. offset is aligned
by IO size(1024bytes).
6: measure time of preading randomly 100000 times on a test file.
The result was:
2.6.26
330 sec
2.6.26-patched
226 sec
Arch:i386
Filesystem:ext3
Blocksize:1024 bytes
Memory: 1GB
On ext3/4, a file is written through buffer/block. So random read/write
mixed workloads or random read after random write workloads are optimized
with this patch under pagesize != blocksize environment. This test result
showed this.
The benchmark program is as follows:
#include <stdio.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
#include <time.h>
#include <stdlib.h>
#include <string.h>
#include <sys/mount.h>
#define LEN 1024
#define LOOP 1024*512 /* 512MB */
main(void)
{
unsigned long i, offset, filesize;
int fd;
char buf[LEN];
time_t t1, t2;
if (mount("/dev/sda1", "/root/test1/", "ext3", 0, 0) < 0) {
perror("cannot mount\n");
exit(1);
}
memset(buf, 0, LEN);
fd = open("/root/test1/testfile", O_CREAT|O_RDWR|O_TRUNC);
if (fd < 0) {
perror("cannot open file\n");
exit(1);
}
for (i = 0; i < LOOP; i++)
write(fd, buf, LEN);
close(fd);
if (umount("/root/test1/") < 0) {
perror("cannot umount\n");
exit(1);
}
if (mount("/dev/sda1", "/root/test1/", "ext3", 0, 0) < 0) {
perror("cannot mount\n");
exit(1);
}
fd = open("/root/test1/testfile", O_RDWR);
if (fd < 0) {
perror("cannot open file\n");
exit(1);
}
filesize = LEN * LOOP;
for (i = 0; i < 300000; i++){
offset = (random() % filesize) & (~(LEN - 1));
pwrite(fd, buf, LEN, offset);
}
printf("start test\n");
time(&t1);
for (i = 0; i < 100000; i++){
offset = (random() % filesize) & (~(LEN - 1));
pread(fd, buf, LEN, offset);
}
time(&t2);
printf("%ld sec\n", t2-t1);
close(fd);
if (umount("/root/test1/") < 0) {
perror("cannot umount\n");
exit(1);
}
}
Signed-off-by: Hisashi Hifumi <hifumi.hisashi@oss.ntt.co.jp>
Cc: Nick Piggin <nickpiggin@yahoo.com.au>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Jan Kara <jack@ucw.cz>
Cc: <linux-ext4@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2008-07-29 00:46:36 +02:00
|
|
|
.write_begin = ext4_write_begin,
|
|
|
|
.write_end = ext4_journalled_write_end,
|
|
|
|
.set_page_dirty = ext4_journalled_set_page_dirty,
|
|
|
|
.bmap = ext4_bmap,
|
|
|
|
.invalidatepage = ext4_invalidatepage,
|
|
|
|
.releasepage = ext4_releasepage,
|
2011-08-31 17:56:51 +02:00
|
|
|
.direct_IO = ext4_direct_IO,
|
vfs: pagecache usage optimization for pagesize!=blocksize
When we read some part of a file through pagecache, if there is a
pagecache of corresponding index but this page is not uptodate, read IO
is issued and this page will be uptodate.
I think this is good for pagesize == blocksize environment but there is
room for improvement on pagesize != blocksize environment. Because in
this case a page can have multiple buffers and even if a page is not
uptodate, some buffers can be uptodate.
So I suggest that when all buffers which correspond to a part of a file
that we want to read are uptodate, use this pagecache and copy data from
this pagecache to user buffer even if a page is not uptodate. This can
reduce read IO and improve system throughput.
I wrote a benchmark program and got result number with this program.
This benchmark do:
1: mount and open a test file.
2: create a 512MB file.
3: close a file and umount.
4: mount and again open a test file.
5: pwrite randomly 300000 times on a test file. offset is aligned
by IO size(1024bytes).
6: measure time of preading randomly 100000 times on a test file.
The result was:
2.6.26
330 sec
2.6.26-patched
226 sec
Arch:i386
Filesystem:ext3
Blocksize:1024 bytes
Memory: 1GB
On ext3/4, a file is written through buffer/block. So random read/write
mixed workloads or random read after random write workloads are optimized
with this patch under pagesize != blocksize environment. This test result
showed this.
The benchmark program is as follows:
#include <stdio.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
#include <time.h>
#include <stdlib.h>
#include <string.h>
#include <sys/mount.h>
#define LEN 1024
#define LOOP 1024*512 /* 512MB */
main(void)
{
unsigned long i, offset, filesize;
int fd;
char buf[LEN];
time_t t1, t2;
if (mount("/dev/sda1", "/root/test1/", "ext3", 0, 0) < 0) {
perror("cannot mount\n");
exit(1);
}
memset(buf, 0, LEN);
fd = open("/root/test1/testfile", O_CREAT|O_RDWR|O_TRUNC);
if (fd < 0) {
perror("cannot open file\n");
exit(1);
}
for (i = 0; i < LOOP; i++)
write(fd, buf, LEN);
close(fd);
if (umount("/root/test1/") < 0) {
perror("cannot umount\n");
exit(1);
}
if (mount("/dev/sda1", "/root/test1/", "ext3", 0, 0) < 0) {
perror("cannot mount\n");
exit(1);
}
fd = open("/root/test1/testfile", O_RDWR);
if (fd < 0) {
perror("cannot open file\n");
exit(1);
}
filesize = LEN * LOOP;
for (i = 0; i < 300000; i++){
offset = (random() % filesize) & (~(LEN - 1));
pwrite(fd, buf, LEN, offset);
}
printf("start test\n");
time(&t1);
for (i = 0; i < 100000; i++){
offset = (random() % filesize) & (~(LEN - 1));
pread(fd, buf, LEN, offset);
}
time(&t2);
printf("%ld sec\n", t2-t1);
close(fd);
if (umount("/root/test1/") < 0) {
perror("cannot umount\n");
exit(1);
}
}
Signed-off-by: Hisashi Hifumi <hifumi.hisashi@oss.ntt.co.jp>
Cc: Nick Piggin <nickpiggin@yahoo.com.au>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Jan Kara <jack@ucw.cz>
Cc: <linux-ext4@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2008-07-29 00:46:36 +02:00
|
|
|
.is_partially_uptodate = block_is_partially_uptodate,
|
2009-09-16 11:50:16 +02:00
|
|
|
.error_remove_page = generic_error_remove_page,
|
2006-10-11 10:20:50 +02:00
|
|
|
};
|
|
|
|
|
2008-07-12 01:27:31 +02:00
|
|
|
static const struct address_space_operations ext4_da_aops = {
|
vfs: pagecache usage optimization for pagesize!=blocksize
When we read some part of a file through pagecache, if there is a
pagecache of corresponding index but this page is not uptodate, read IO
is issued and this page will be uptodate.
I think this is good for pagesize == blocksize environment but there is
room for improvement on pagesize != blocksize environment. Because in
this case a page can have multiple buffers and even if a page is not
uptodate, some buffers can be uptodate.
So I suggest that when all buffers which correspond to a part of a file
that we want to read are uptodate, use this pagecache and copy data from
this pagecache to user buffer even if a page is not uptodate. This can
reduce read IO and improve system throughput.
I wrote a benchmark program and got result number with this program.
This benchmark do:
1: mount and open a test file.
2: create a 512MB file.
3: close a file and umount.
4: mount and again open a test file.
5: pwrite randomly 300000 times on a test file. offset is aligned
by IO size(1024bytes).
6: measure time of preading randomly 100000 times on a test file.
The result was:
2.6.26
330 sec
2.6.26-patched
226 sec
Arch:i386
Filesystem:ext3
Blocksize:1024 bytes
Memory: 1GB
On ext3/4, a file is written through buffer/block. So random read/write
mixed workloads or random read after random write workloads are optimized
with this patch under pagesize != blocksize environment. This test result
showed this.
The benchmark program is as follows:
#include <stdio.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
#include <time.h>
#include <stdlib.h>
#include <string.h>
#include <sys/mount.h>
#define LEN 1024
#define LOOP 1024*512 /* 512MB */
main(void)
{
unsigned long i, offset, filesize;
int fd;
char buf[LEN];
time_t t1, t2;
if (mount("/dev/sda1", "/root/test1/", "ext3", 0, 0) < 0) {
perror("cannot mount\n");
exit(1);
}
memset(buf, 0, LEN);
fd = open("/root/test1/testfile", O_CREAT|O_RDWR|O_TRUNC);
if (fd < 0) {
perror("cannot open file\n");
exit(1);
}
for (i = 0; i < LOOP; i++)
write(fd, buf, LEN);
close(fd);
if (umount("/root/test1/") < 0) {
perror("cannot umount\n");
exit(1);
}
if (mount("/dev/sda1", "/root/test1/", "ext3", 0, 0) < 0) {
perror("cannot mount\n");
exit(1);
}
fd = open("/root/test1/testfile", O_RDWR);
if (fd < 0) {
perror("cannot open file\n");
exit(1);
}
filesize = LEN * LOOP;
for (i = 0; i < 300000; i++){
offset = (random() % filesize) & (~(LEN - 1));
pwrite(fd, buf, LEN, offset);
}
printf("start test\n");
time(&t1);
for (i = 0; i < 100000; i++){
offset = (random() % filesize) & (~(LEN - 1));
pread(fd, buf, LEN, offset);
}
time(&t2);
printf("%ld sec\n", t2-t1);
close(fd);
if (umount("/root/test1/") < 0) {
perror("cannot umount\n");
exit(1);
}
}
Signed-off-by: Hisashi Hifumi <hifumi.hisashi@oss.ntt.co.jp>
Cc: Nick Piggin <nickpiggin@yahoo.com.au>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Jan Kara <jack@ucw.cz>
Cc: <linux-ext4@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2008-07-29 00:46:36 +02:00
|
|
|
.readpage = ext4_readpage,
|
|
|
|
.readpages = ext4_readpages,
|
2009-06-14 23:58:45 +02:00
|
|
|
.writepage = ext4_writepage,
|
vfs: pagecache usage optimization for pagesize!=blocksize
When we read some part of a file through pagecache, if there is a
pagecache of corresponding index but this page is not uptodate, read IO
is issued and this page will be uptodate.
I think this is good for pagesize == blocksize environment but there is
room for improvement on pagesize != blocksize environment. Because in
this case a page can have multiple buffers and even if a page is not
uptodate, some buffers can be uptodate.
So I suggest that when all buffers which correspond to a part of a file
that we want to read are uptodate, use this pagecache and copy data from
this pagecache to user buffer even if a page is not uptodate. This can
reduce read IO and improve system throughput.
I wrote a benchmark program and got result number with this program.
This benchmark do:
1: mount and open a test file.
2: create a 512MB file.
3: close a file and umount.
4: mount and again open a test file.
5: pwrite randomly 300000 times on a test file. offset is aligned
by IO size(1024bytes).
6: measure time of preading randomly 100000 times on a test file.
The result was:
2.6.26
330 sec
2.6.26-patched
226 sec
Arch:i386
Filesystem:ext3
Blocksize:1024 bytes
Memory: 1GB
On ext3/4, a file is written through buffer/block. So random read/write
mixed workloads or random read after random write workloads are optimized
with this patch under pagesize != blocksize environment. This test result
showed this.
The benchmark program is as follows:
#include <stdio.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
#include <time.h>
#include <stdlib.h>
#include <string.h>
#include <sys/mount.h>
#define LEN 1024
#define LOOP 1024*512 /* 512MB */
main(void)
{
unsigned long i, offset, filesize;
int fd;
char buf[LEN];
time_t t1, t2;
if (mount("/dev/sda1", "/root/test1/", "ext3", 0, 0) < 0) {
perror("cannot mount\n");
exit(1);
}
memset(buf, 0, LEN);
fd = open("/root/test1/testfile", O_CREAT|O_RDWR|O_TRUNC);
if (fd < 0) {
perror("cannot open file\n");
exit(1);
}
for (i = 0; i < LOOP; i++)
write(fd, buf, LEN);
close(fd);
if (umount("/root/test1/") < 0) {
perror("cannot umount\n");
exit(1);
}
if (mount("/dev/sda1", "/root/test1/", "ext3", 0, 0) < 0) {
perror("cannot mount\n");
exit(1);
}
fd = open("/root/test1/testfile", O_RDWR);
if (fd < 0) {
perror("cannot open file\n");
exit(1);
}
filesize = LEN * LOOP;
for (i = 0; i < 300000; i++){
offset = (random() % filesize) & (~(LEN - 1));
pwrite(fd, buf, LEN, offset);
}
printf("start test\n");
time(&t1);
for (i = 0; i < 100000; i++){
offset = (random() % filesize) & (~(LEN - 1));
pread(fd, buf, LEN, offset);
}
time(&t2);
printf("%ld sec\n", t2-t1);
close(fd);
if (umount("/root/test1/") < 0) {
perror("cannot umount\n");
exit(1);
}
}
Signed-off-by: Hisashi Hifumi <hifumi.hisashi@oss.ntt.co.jp>
Cc: Nick Piggin <nickpiggin@yahoo.com.au>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Jan Kara <jack@ucw.cz>
Cc: <linux-ext4@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2008-07-29 00:46:36 +02:00
|
|
|
.writepages = ext4_da_writepages,
|
|
|
|
.write_begin = ext4_da_write_begin,
|
|
|
|
.write_end = ext4_da_write_end,
|
|
|
|
.bmap = ext4_bmap,
|
|
|
|
.invalidatepage = ext4_da_invalidatepage,
|
|
|
|
.releasepage = ext4_releasepage,
|
|
|
|
.direct_IO = ext4_direct_IO,
|
|
|
|
.migratepage = buffer_migrate_page,
|
|
|
|
.is_partially_uptodate = block_is_partially_uptodate,
|
2009-09-16 11:50:16 +02:00
|
|
|
.error_remove_page = generic_error_remove_page,
|
2008-07-12 01:27:31 +02:00
|
|
|
};
|
|
|
|
|
2006-10-11 10:20:53 +02:00
|
|
|
void ext4_set_aops(struct inode *inode)
|
2006-10-11 10:20:50 +02:00
|
|
|
{
|
2008-07-12 01:27:31 +02:00
|
|
|
if (ext4_should_order_data(inode) &&
|
|
|
|
test_opt(inode->i_sb, DELALLOC))
|
|
|
|
inode->i_mapping->a_ops = &ext4_da_aops;
|
|
|
|
else if (ext4_should_order_data(inode))
|
2006-10-11 10:20:53 +02:00
|
|
|
inode->i_mapping->a_ops = &ext4_ordered_aops;
|
2008-07-12 01:27:31 +02:00
|
|
|
else if (ext4_should_writeback_data(inode) &&
|
|
|
|
test_opt(inode->i_sb, DELALLOC))
|
|
|
|
inode->i_mapping->a_ops = &ext4_da_aops;
|
2006-10-11 10:20:53 +02:00
|
|
|
else if (ext4_should_writeback_data(inode))
|
|
|
|
inode->i_mapping->a_ops = &ext4_writeback_aops;
|
2006-10-11 10:20:50 +02:00
|
|
|
else
|
2006-10-11 10:20:53 +02:00
|
|
|
inode->i_mapping->a_ops = &ext4_journalled_aops;
|
2006-10-11 10:20:50 +02:00
|
|
|
}
|
|
|
|
|
2011-09-03 17:51:09 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
* ext4_discard_partial_page_buffers()
|
|
|
|
* Wrapper function for ext4_discard_partial_page_buffers_no_lock.
|
|
|
|
* This function finds and locks the page containing the offset
|
|
|
|
* "from" and passes it to ext4_discard_partial_page_buffers_no_lock.
|
|
|
|
* Calling functions that already have the page locked should call
|
|
|
|
* ext4_discard_partial_page_buffers_no_lock directly.
|
|
|
|
*/
|
|
|
|
int ext4_discard_partial_page_buffers(handle_t *handle,
|
|
|
|
struct address_space *mapping, loff_t from,
|
|
|
|
loff_t length, int flags)
|
|
|
|
{
|
|
|
|
struct inode *inode = mapping->host;
|
|
|
|
struct page *page;
|
|
|
|
int err = 0;
|
|
|
|
|
|
|
|
page = find_or_create_page(mapping, from >> PAGE_CACHE_SHIFT,
|
|
|
|
mapping_gfp_mask(mapping) & ~__GFP_FS);
|
|
|
|
if (!page)
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
err = ext4_discard_partial_page_buffers_no_lock(handle, inode, page,
|
|
|
|
from, length, flags);
|
|
|
|
|
|
|
|
unlock_page(page);
|
|
|
|
page_cache_release(page);
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* ext4_discard_partial_page_buffers_no_lock()
|
|
|
|
* Zeros a page range of length 'length' starting from offset 'from'.
|
|
|
|
* Buffer heads that correspond to the block aligned regions of the
|
|
|
|
* zeroed range will be unmapped. Unblock aligned regions
|
|
|
|
* will have the corresponding buffer head mapped if needed so that
|
|
|
|
* that region of the page can be updated with the partial zero out.
|
|
|
|
*
|
|
|
|
* This function assumes that the page has already been locked. The
|
|
|
|
* The range to be discarded must be contained with in the given page.
|
|
|
|
* If the specified range exceeds the end of the page it will be shortened
|
|
|
|
* to the end of the page that corresponds to 'from'. This function is
|
|
|
|
* appropriate for updating a page and it buffer heads to be unmapped and
|
|
|
|
* zeroed for blocks that have been either released, or are going to be
|
|
|
|
* released.
|
|
|
|
*
|
|
|
|
* handle: The journal handle
|
|
|
|
* inode: The files inode
|
|
|
|
* page: A locked page that contains the offset "from"
|
|
|
|
* from: The starting byte offset (from the begining of the file)
|
|
|
|
* to begin discarding
|
|
|
|
* len: The length of bytes to discard
|
|
|
|
* flags: Optional flags that may be used:
|
|
|
|
*
|
|
|
|
* EXT4_DISCARD_PARTIAL_PG_ZERO_UNMAPPED
|
|
|
|
* Only zero the regions of the page whose buffer heads
|
|
|
|
* have already been unmapped. This flag is appropriate
|
|
|
|
* for updateing the contents of a page whose blocks may
|
|
|
|
* have already been released, and we only want to zero
|
|
|
|
* out the regions that correspond to those released blocks.
|
|
|
|
*
|
|
|
|
* Returns zero on sucess or negative on failure.
|
|
|
|
*/
|
|
|
|
int ext4_discard_partial_page_buffers_no_lock(handle_t *handle,
|
|
|
|
struct inode *inode, struct page *page, loff_t from,
|
|
|
|
loff_t length, int flags)
|
|
|
|
{
|
|
|
|
ext4_fsblk_t index = from >> PAGE_CACHE_SHIFT;
|
|
|
|
unsigned int offset = from & (PAGE_CACHE_SIZE-1);
|
|
|
|
unsigned int blocksize, max, pos;
|
|
|
|
unsigned int end_of_block, range_to_discard;
|
|
|
|
ext4_lblk_t iblock;
|
|
|
|
struct buffer_head *bh;
|
|
|
|
int err = 0;
|
|
|
|
|
|
|
|
blocksize = inode->i_sb->s_blocksize;
|
|
|
|
max = PAGE_CACHE_SIZE - offset;
|
|
|
|
|
|
|
|
if (index != page->index)
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* correct length if it does not fall between
|
|
|
|
* 'from' and the end of the page
|
|
|
|
*/
|
|
|
|
if (length > max || length < 0)
|
|
|
|
length = max;
|
|
|
|
|
|
|
|
iblock = index << (PAGE_CACHE_SHIFT - inode->i_sb->s_blocksize_bits);
|
|
|
|
|
|
|
|
if (!page_has_buffers(page)) {
|
|
|
|
/*
|
|
|
|
* If the range to be discarded covers a partial block
|
|
|
|
* we need to get the page buffers. This is because
|
|
|
|
* partial blocks cannot be released and the page needs
|
|
|
|
* to be updated with the contents of the block before
|
|
|
|
* we write the zeros on top of it.
|
|
|
|
*/
|
|
|
|
if (!(from & (blocksize - 1)) ||
|
|
|
|
!((from + length) & (blocksize - 1))) {
|
|
|
|
create_empty_buffers(page, blocksize, 0);
|
|
|
|
} else {
|
|
|
|
/*
|
|
|
|
* If there are no partial blocks,
|
|
|
|
* there is nothing to update,
|
|
|
|
* so we can return now
|
|
|
|
*/
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Find the buffer that contains "offset" */
|
|
|
|
bh = page_buffers(page);
|
|
|
|
pos = blocksize;
|
|
|
|
while (offset >= pos) {
|
|
|
|
bh = bh->b_this_page;
|
|
|
|
iblock++;
|
|
|
|
pos += blocksize;
|
|
|
|
}
|
|
|
|
|
|
|
|
pos = offset;
|
|
|
|
while (pos < offset + length) {
|
|
|
|
err = 0;
|
|
|
|
|
|
|
|
/* The length of space left to zero and unmap */
|
|
|
|
range_to_discard = offset + length - pos;
|
|
|
|
|
|
|
|
/* The length of space until the end of the block */
|
|
|
|
end_of_block = blocksize - (pos & (blocksize-1));
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Do not unmap or zero past end of block
|
|
|
|
* for this buffer head
|
|
|
|
*/
|
|
|
|
if (range_to_discard > end_of_block)
|
|
|
|
range_to_discard = end_of_block;
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Skip this buffer head if we are only zeroing unampped
|
|
|
|
* regions of the page
|
|
|
|
*/
|
|
|
|
if (flags & EXT4_DISCARD_PARTIAL_PG_ZERO_UNMAPPED &&
|
|
|
|
buffer_mapped(bh))
|
|
|
|
goto next;
|
|
|
|
|
|
|
|
/* If the range is block aligned, unmap */
|
|
|
|
if (range_to_discard == blocksize) {
|
|
|
|
clear_buffer_dirty(bh);
|
|
|
|
bh->b_bdev = NULL;
|
|
|
|
clear_buffer_mapped(bh);
|
|
|
|
clear_buffer_req(bh);
|
|
|
|
clear_buffer_new(bh);
|
|
|
|
clear_buffer_delay(bh);
|
|
|
|
clear_buffer_unwritten(bh);
|
|
|
|
clear_buffer_uptodate(bh);
|
|
|
|
zero_user(page, pos, range_to_discard);
|
|
|
|
BUFFER_TRACE(bh, "Buffer discarded");
|
|
|
|
goto next;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If this block is not completely contained in the range
|
|
|
|
* to be discarded, then it is not going to be released. Because
|
|
|
|
* we need to keep this block, we need to make sure this part
|
|
|
|
* of the page is uptodate before we modify it by writeing
|
|
|
|
* partial zeros on it.
|
|
|
|
*/
|
|
|
|
if (!buffer_mapped(bh)) {
|
|
|
|
/*
|
|
|
|
* Buffer head must be mapped before we can read
|
|
|
|
* from the block
|
|
|
|
*/
|
|
|
|
BUFFER_TRACE(bh, "unmapped");
|
|
|
|
ext4_get_block(inode, iblock, bh, 0);
|
|
|
|
/* unmapped? It's a hole - nothing to do */
|
|
|
|
if (!buffer_mapped(bh)) {
|
|
|
|
BUFFER_TRACE(bh, "still unmapped");
|
|
|
|
goto next;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Ok, it's mapped. Make sure it's up-to-date */
|
|
|
|
if (PageUptodate(page))
|
|
|
|
set_buffer_uptodate(bh);
|
|
|
|
|
|
|
|
if (!buffer_uptodate(bh)) {
|
|
|
|
err = -EIO;
|
|
|
|
ll_rw_block(READ, 1, &bh);
|
|
|
|
wait_on_buffer(bh);
|
|
|
|
/* Uhhuh. Read error. Complain and punt.*/
|
|
|
|
if (!buffer_uptodate(bh))
|
|
|
|
goto next;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ext4_should_journal_data(inode)) {
|
|
|
|
BUFFER_TRACE(bh, "get write access");
|
|
|
|
err = ext4_journal_get_write_access(handle, bh);
|
|
|
|
if (err)
|
|
|
|
goto next;
|
|
|
|
}
|
|
|
|
|
|
|
|
zero_user(page, pos, range_to_discard);
|
|
|
|
|
|
|
|
err = 0;
|
|
|
|
if (ext4_should_journal_data(inode)) {
|
|
|
|
err = ext4_handle_dirty_metadata(handle, inode, bh);
|
ext4: only call ext4_jbd2_file_inode when an inode has been extended
In delayed allocation mode, it's important to only call
ext4_jbd2_file_inode when the file has been extended. This is
necessary to avoid a race which first got introduced in commit
678aaf481, but which was made much more common with the introduction
of the "punch hole" functionality. (Especially when dioread_nolock
was enabled; when I could reliably reproduce this problem with
xfstests #74.)
The race is this: If while trying to writeback a delayed allocation
inode, there is a need to map delalloc blocks, and we run out of space
in the journal, *and* at the same time the inode is already on the
committing transaction's t_inode_list (because for example while doing
the punch hole operation, ext4_jbd2_file_inode() is called), then the
commit operation will wait for the inode to finish all of its pending
writebacks by calling filemap_fdatawait(), but since that inode has
one or more pages with the PageWriteback flag set, the commit
operation will wait forever, and the so the writeback of the inode can
never take place, and the kjournald thread and the writeback thread
end up waiting for each other --- forever.
It's important at this point to recall why an inode is placed on the
t_inode_list; it is to provide the data=ordered guarantees that we
don't end up exposing stale data. In the case where we are truncating
or punching a hole in the inode, there is no possibility that stale
data could be exposed in the first place, so we don't need to put the
inode on the t_inode_list!
The right long-term fix is to get rid of data=ordered mode altogether,
and only update the extent tree or indirect blocks after the data has
been written. Until then, this change will also avoid some
unnecessary waiting in the commit operation.
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Cc: Allison Henderson <achender@linux.vnet.ibm.com>
Cc: Jan Kara <jack@suse.cz>
2011-09-06 08:37:06 +02:00
|
|
|
} else
|
2011-09-03 17:51:09 +02:00
|
|
|
mark_buffer_dirty(bh);
|
|
|
|
|
|
|
|
BUFFER_TRACE(bh, "Partial buffer zeroed");
|
|
|
|
next:
|
|
|
|
bh = bh->b_this_page;
|
|
|
|
iblock++;
|
|
|
|
pos += range_to_discard;
|
|
|
|
}
|
|
|
|
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2006-10-11 10:20:50 +02:00
|
|
|
/*
|
2006-10-11 10:20:53 +02:00
|
|
|
* ext4_block_truncate_page() zeroes out a mapping from file offset `from'
|
2006-10-11 10:20:50 +02:00
|
|
|
* up to the end of the block which corresponds to `from'.
|
|
|
|
* This required during truncate. We need to physically zero the tail end
|
|
|
|
* of that block so it doesn't yield old data if the file is later grown.
|
|
|
|
*/
|
2008-07-12 01:27:31 +02:00
|
|
|
int ext4_block_truncate_page(handle_t *handle,
|
2006-10-11 10:20:50 +02:00
|
|
|
struct address_space *mapping, loff_t from)
|
2011-05-25 13:41:32 +02:00
|
|
|
{
|
|
|
|
unsigned offset = from & (PAGE_CACHE_SIZE-1);
|
|
|
|
unsigned length;
|
|
|
|
unsigned blocksize;
|
|
|
|
struct inode *inode = mapping->host;
|
|
|
|
|
|
|
|
blocksize = inode->i_sb->s_blocksize;
|
|
|
|
length = blocksize - (offset & (blocksize - 1));
|
|
|
|
|
|
|
|
return ext4_block_zero_page_range(handle, mapping, from, length);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* ext4_block_zero_page_range() zeros out a mapping of length 'length'
|
|
|
|
* starting from file offset 'from'. The range to be zero'd must
|
|
|
|
* be contained with in one block. If the specified range exceeds
|
|
|
|
* the end of the block it will be shortened to end of the block
|
|
|
|
* that cooresponds to 'from'
|
|
|
|
*/
|
|
|
|
int ext4_block_zero_page_range(handle_t *handle,
|
|
|
|
struct address_space *mapping, loff_t from, loff_t length)
|
2006-10-11 10:20:50 +02:00
|
|
|
{
|
2006-10-11 10:20:53 +02:00
|
|
|
ext4_fsblk_t index = from >> PAGE_CACHE_SHIFT;
|
2006-10-11 10:20:50 +02:00
|
|
|
unsigned offset = from & (PAGE_CACHE_SIZE-1);
|
2011-05-25 13:41:32 +02:00
|
|
|
unsigned blocksize, max, pos;
|
2008-01-29 05:58:27 +01:00
|
|
|
ext4_lblk_t iblock;
|
2006-10-11 10:20:50 +02:00
|
|
|
struct inode *inode = mapping->host;
|
|
|
|
struct buffer_head *bh;
|
2008-07-12 01:27:31 +02:00
|
|
|
struct page *page;
|
2006-10-11 10:20:50 +02:00
|
|
|
int err = 0;
|
|
|
|
|
2009-07-06 04:08:16 +02:00
|
|
|
page = find_or_create_page(mapping, from >> PAGE_CACHE_SHIFT,
|
|
|
|
mapping_gfp_mask(mapping) & ~__GFP_FS);
|
2008-07-12 01:27:31 +02:00
|
|
|
if (!page)
|
|
|
|
return -EINVAL;
|
|
|
|
|
2006-10-11 10:20:50 +02:00
|
|
|
blocksize = inode->i_sb->s_blocksize;
|
2011-05-25 13:41:32 +02:00
|
|
|
max = blocksize - (offset & (blocksize - 1));
|
|
|
|
|
|
|
|
/*
|
|
|
|
* correct length if it does not fall between
|
|
|
|
* 'from' and the end of the block
|
|
|
|
*/
|
|
|
|
if (length > max || length < 0)
|
|
|
|
length = max;
|
|
|
|
|
2006-10-11 10:20:50 +02:00
|
|
|
iblock = index << (PAGE_CACHE_SHIFT - inode->i_sb->s_blocksize_bits);
|
|
|
|
|
|
|
|
if (!page_has_buffers(page))
|
|
|
|
create_empty_buffers(page, blocksize, 0);
|
|
|
|
|
|
|
|
/* Find the buffer that contains "offset" */
|
|
|
|
bh = page_buffers(page);
|
|
|
|
pos = blocksize;
|
|
|
|
while (offset >= pos) {
|
|
|
|
bh = bh->b_this_page;
|
|
|
|
iblock++;
|
|
|
|
pos += blocksize;
|
|
|
|
}
|
|
|
|
|
|
|
|
err = 0;
|
|
|
|
if (buffer_freed(bh)) {
|
|
|
|
BUFFER_TRACE(bh, "freed: skip");
|
|
|
|
goto unlock;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!buffer_mapped(bh)) {
|
|
|
|
BUFFER_TRACE(bh, "unmapped");
|
2006-10-11 10:20:53 +02:00
|
|
|
ext4_get_block(inode, iblock, bh, 0);
|
2006-10-11 10:20:50 +02:00
|
|
|
/* unmapped? It's a hole - nothing to do */
|
|
|
|
if (!buffer_mapped(bh)) {
|
|
|
|
BUFFER_TRACE(bh, "still unmapped");
|
|
|
|
goto unlock;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Ok, it's mapped. Make sure it's up-to-date */
|
|
|
|
if (PageUptodate(page))
|
|
|
|
set_buffer_uptodate(bh);
|
|
|
|
|
|
|
|
if (!buffer_uptodate(bh)) {
|
|
|
|
err = -EIO;
|
|
|
|
ll_rw_block(READ, 1, &bh);
|
|
|
|
wait_on_buffer(bh);
|
|
|
|
/* Uhhuh. Read error. Complain and punt. */
|
|
|
|
if (!buffer_uptodate(bh))
|
|
|
|
goto unlock;
|
|
|
|
}
|
|
|
|
|
2006-10-11 10:20:53 +02:00
|
|
|
if (ext4_should_journal_data(inode)) {
|
2006-10-11 10:20:50 +02:00
|
|
|
BUFFER_TRACE(bh, "get write access");
|
2006-10-11 10:20:53 +02:00
|
|
|
err = ext4_journal_get_write_access(handle, bh);
|
2006-10-11 10:20:50 +02:00
|
|
|
if (err)
|
|
|
|
goto unlock;
|
|
|
|
}
|
|
|
|
|
2008-02-05 07:28:29 +01:00
|
|
|
zero_user(page, offset, length);
|
2006-10-11 10:20:50 +02:00
|
|
|
|
|
|
|
BUFFER_TRACE(bh, "zeroed end of block");
|
|
|
|
|
|
|
|
err = 0;
|
2006-10-11 10:20:53 +02:00
|
|
|
if (ext4_should_journal_data(inode)) {
|
2009-01-07 06:06:22 +01:00
|
|
|
err = ext4_handle_dirty_metadata(handle, inode, bh);
|
ext4: only call ext4_jbd2_file_inode when an inode has been extended
In delayed allocation mode, it's important to only call
ext4_jbd2_file_inode when the file has been extended. This is
necessary to avoid a race which first got introduced in commit
678aaf481, but which was made much more common with the introduction
of the "punch hole" functionality. (Especially when dioread_nolock
was enabled; when I could reliably reproduce this problem with
xfstests #74.)
The race is this: If while trying to writeback a delayed allocation
inode, there is a need to map delalloc blocks, and we run out of space
in the journal, *and* at the same time the inode is already on the
committing transaction's t_inode_list (because for example while doing
the punch hole operation, ext4_jbd2_file_inode() is called), then the
commit operation will wait for the inode to finish all of its pending
writebacks by calling filemap_fdatawait(), but since that inode has
one or more pages with the PageWriteback flag set, the commit
operation will wait forever, and the so the writeback of the inode can
never take place, and the kjournald thread and the writeback thread
end up waiting for each other --- forever.
It's important at this point to recall why an inode is placed on the
t_inode_list; it is to provide the data=ordered guarantees that we
don't end up exposing stale data. In the case where we are truncating
or punching a hole in the inode, there is no possibility that stale
data could be exposed in the first place, so we don't need to put the
inode on the t_inode_list!
The right long-term fix is to get rid of data=ordered mode altogether,
and only update the extent tree or indirect blocks after the data has
been written. Until then, this change will also avoid some
unnecessary waiting in the commit operation.
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Cc: Allison Henderson <achender@linux.vnet.ibm.com>
Cc: Jan Kara <jack@suse.cz>
2011-09-06 08:37:06 +02:00
|
|
|
} else
|
2006-10-11 10:20:50 +02:00
|
|
|
mark_buffer_dirty(bh);
|
|
|
|
|
|
|
|
unlock:
|
|
|
|
unlock_page(page);
|
|
|
|
page_cache_release(page);
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2008-07-12 01:27:31 +02:00
|
|
|
int ext4_can_truncate(struct inode *inode)
|
|
|
|
{
|
|
|
|
if (S_ISREG(inode->i_mode))
|
|
|
|
return 1;
|
|
|
|
if (S_ISDIR(inode->i_mode))
|
|
|
|
return 1;
|
|
|
|
if (S_ISLNK(inode->i_mode))
|
|
|
|
return !ext4_inode_is_fast_symlink(inode);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2011-05-25 13:41:50 +02:00
|
|
|
/*
|
|
|
|
* ext4_punch_hole: punches a hole in a file by releaseing the blocks
|
|
|
|
* associated with the given offset and length
|
|
|
|
*
|
|
|
|
* @inode: File inode
|
|
|
|
* @offset: The offset where the hole will begin
|
|
|
|
* @len: The length of the hole
|
|
|
|
*
|
|
|
|
* Returns: 0 on sucess or negative on failure
|
|
|
|
*/
|
|
|
|
|
|
|
|
int ext4_punch_hole(struct file *file, loff_t offset, loff_t length)
|
|
|
|
{
|
|
|
|
struct inode *inode = file->f_path.dentry->d_inode;
|
|
|
|
if (!S_ISREG(inode->i_mode))
|
|
|
|
return -ENOTSUPP;
|
|
|
|
|
|
|
|
if (!ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS)) {
|
|
|
|
/* TODO: Add support for non extent hole punching */
|
|
|
|
return -ENOTSUPP;
|
|
|
|
}
|
|
|
|
|
2011-09-10 00:36:51 +02:00
|
|
|
if (EXT4_SB(inode->i_sb)->s_cluster_ratio > 1) {
|
|
|
|
/* TODO: Add support for bigalloc file systems */
|
|
|
|
return -ENOTSUPP;
|
|
|
|
}
|
|
|
|
|
2011-05-25 13:41:50 +02:00
|
|
|
return ext4_ext_punch_hole(file, offset, length);
|
|
|
|
}
|
|
|
|
|
2006-10-11 10:20:50 +02:00
|
|
|
/*
|
2006-10-11 10:20:53 +02:00
|
|
|
* ext4_truncate()
|
2006-10-11 10:20:50 +02:00
|
|
|
*
|
2006-10-11 10:20:53 +02:00
|
|
|
* We block out ext4_get_block() block instantiations across the entire
|
|
|
|
* transaction, and VFS/VM ensures that ext4_truncate() cannot run
|
2006-10-11 10:20:50 +02:00
|
|
|
* simultaneously on behalf of the same inode.
|
|
|
|
*
|
|
|
|
* As we work through the truncate and commmit bits of it to the journal there
|
|
|
|
* is one core, guiding principle: the file's tree must always be consistent on
|
|
|
|
* disk. We must be able to restart the truncate after a crash.
|
|
|
|
*
|
|
|
|
* The file's tree may be transiently inconsistent in memory (although it
|
|
|
|
* probably isn't), but whenever we close off and commit a journal transaction,
|
|
|
|
* the contents of (the filesystem + the journal) must be consistent and
|
|
|
|
* restartable. It's pretty simple, really: bottom up, right to left (although
|
|
|
|
* left-to-right works OK too).
|
|
|
|
*
|
|
|
|
* Note that at recovery time, journal replay occurs *before* the restart of
|
|
|
|
* truncate against the orphan inode list.
|
|
|
|
*
|
|
|
|
* The committed inode has the new, desired i_size (which is the same as
|
2006-10-11 10:20:53 +02:00
|
|
|
* i_disksize in this case). After a crash, ext4_orphan_cleanup() will see
|
2006-10-11 10:20:50 +02:00
|
|
|
* that this inode's truncate did not complete and it will again call
|
2006-10-11 10:20:53 +02:00
|
|
|
* ext4_truncate() to have another go. So there will be instantiated blocks
|
|
|
|
* to the right of the truncation point in a crashed ext4 filesystem. But
|
2006-10-11 10:20:50 +02:00
|
|
|
* that's fine - as long as they are linked from the inode, the post-crash
|
2006-10-11 10:20:53 +02:00
|
|
|
* ext4_truncate() run will find them and release them.
|
2006-10-11 10:20:50 +02:00
|
|
|
*/
|
2006-10-11 10:20:53 +02:00
|
|
|
void ext4_truncate(struct inode *inode)
|
2006-10-11 10:20:50 +02:00
|
|
|
{
|
2011-03-22 02:38:05 +01:00
|
|
|
trace_ext4_truncate_enter(inode);
|
|
|
|
|
2008-07-12 01:27:31 +02:00
|
|
|
if (!ext4_can_truncate(inode))
|
2006-10-11 10:20:50 +02:00
|
|
|
return;
|
|
|
|
|
2010-05-17 04:00:00 +02:00
|
|
|
ext4_clear_inode_flag(inode, EXT4_INODE_EOFBLOCKS);
|
2010-02-24 15:52:53 +01:00
|
|
|
|
2009-09-17 15:34:16 +02:00
|
|
|
if (inode->i_size == 0 && !test_opt(inode->i_sb, NO_AUTO_DA_ALLOC))
|
2010-01-24 20:34:07 +01:00
|
|
|
ext4_set_inode_state(inode, EXT4_STATE_DA_ALLOC_CLOSE);
|
2009-02-24 14:21:14 +01:00
|
|
|
|
2011-06-27 22:36:31 +02:00
|
|
|
if (ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS))
|
2008-07-12 01:27:31 +02:00
|
|
|
ext4_ext_truncate(inode);
|
2011-06-27 22:36:31 +02:00
|
|
|
else
|
|
|
|
ext4_ind_truncate(inode);
|
2006-10-11 10:20:50 +02:00
|
|
|
|
2011-03-22 02:38:05 +01:00
|
|
|
trace_ext4_truncate_exit(inode);
|
2006-10-11 10:20:50 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
2006-10-11 10:20:53 +02:00
|
|
|
* ext4_get_inode_loc returns with an extra refcount against the inode's
|
2006-10-11 10:20:50 +02:00
|
|
|
* underlying buffer_head on success. If 'in_mem' is true, we have all
|
|
|
|
* data in memory that is needed to recreate the on-disk version of this
|
|
|
|
* inode.
|
|
|
|
*/
|
2006-10-11 10:20:53 +02:00
|
|
|
static int __ext4_get_inode_loc(struct inode *inode,
|
|
|
|
struct ext4_iloc *iloc, int in_mem)
|
2006-10-11 10:20:50 +02:00
|
|
|
{
|
2008-10-10 05:53:47 +02:00
|
|
|
struct ext4_group_desc *gdp;
|
|
|
|
struct buffer_head *bh;
|
|
|
|
struct super_block *sb = inode->i_sb;
|
|
|
|
ext4_fsblk_t block;
|
|
|
|
int inodes_per_block, inode_offset;
|
|
|
|
|
2008-11-22 21:04:59 +01:00
|
|
|
iloc->bh = NULL;
|
2008-10-10 05:53:47 +02:00
|
|
|
if (!ext4_valid_inum(sb, inode->i_ino))
|
|
|
|
return -EIO;
|
2006-10-11 10:20:50 +02:00
|
|
|
|
2008-10-10 05:53:47 +02:00
|
|
|
iloc->block_group = (inode->i_ino - 1) / EXT4_INODES_PER_GROUP(sb);
|
|
|
|
gdp = ext4_get_group_desc(sb, iloc->block_group, NULL);
|
|
|
|
if (!gdp)
|
2006-10-11 10:20:50 +02:00
|
|
|
return -EIO;
|
|
|
|
|
2008-10-10 05:53:47 +02:00
|
|
|
/*
|
|
|
|
* Figure out the offset within the block group inode table
|
|
|
|
*/
|
2011-05-09 16:26:41 +02:00
|
|
|
inodes_per_block = EXT4_SB(sb)->s_inodes_per_block;
|
2008-10-10 05:53:47 +02:00
|
|
|
inode_offset = ((inode->i_ino - 1) %
|
|
|
|
EXT4_INODES_PER_GROUP(sb));
|
|
|
|
block = ext4_inode_table(sb, gdp) + (inode_offset / inodes_per_block);
|
|
|
|
iloc->offset = (inode_offset % inodes_per_block) * EXT4_INODE_SIZE(sb);
|
|
|
|
|
|
|
|
bh = sb_getblk(sb, block);
|
2006-10-11 10:20:50 +02:00
|
|
|
if (!bh) {
|
2010-07-27 17:56:40 +02:00
|
|
|
EXT4_ERROR_INODE_BLOCK(inode, block,
|
|
|
|
"unable to read itable block");
|
2006-10-11 10:20:50 +02:00
|
|
|
return -EIO;
|
|
|
|
}
|
|
|
|
if (!buffer_uptodate(bh)) {
|
|
|
|
lock_buffer(bh);
|
2008-07-26 22:39:26 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
* If the buffer has the write error flag, we have failed
|
|
|
|
* to write out another inode in the same block. In this
|
|
|
|
* case, we don't have to read the block because we may
|
|
|
|
* read the old inode data successfully.
|
|
|
|
*/
|
|
|
|
if (buffer_write_io_error(bh) && !buffer_uptodate(bh))
|
|
|
|
set_buffer_uptodate(bh);
|
|
|
|
|
2006-10-11 10:20:50 +02:00
|
|
|
if (buffer_uptodate(bh)) {
|
|
|
|
/* someone brought it uptodate while we waited */
|
|
|
|
unlock_buffer(bh);
|
|
|
|
goto has_buffer;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If we have all information of the inode in memory and this
|
|
|
|
* is the only valid inode in the block, we need not read the
|
|
|
|
* block.
|
|
|
|
*/
|
|
|
|
if (in_mem) {
|
|
|
|
struct buffer_head *bitmap_bh;
|
2008-10-10 05:53:47 +02:00
|
|
|
int i, start;
|
2006-10-11 10:20:50 +02:00
|
|
|
|
2008-10-10 05:53:47 +02:00
|
|
|
start = inode_offset & ~(inodes_per_block - 1);
|
2006-10-11 10:20:50 +02:00
|
|
|
|
2008-10-10 05:53:47 +02:00
|
|
|
/* Is the inode bitmap in cache? */
|
|
|
|
bitmap_bh = sb_getblk(sb, ext4_inode_bitmap(sb, gdp));
|
2006-10-11 10:20:50 +02:00
|
|
|
if (!bitmap_bh)
|
|
|
|
goto make_io;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If the inode bitmap isn't in cache then the
|
|
|
|
* optimisation may end up performing two reads instead
|
|
|
|
* of one, so skip it.
|
|
|
|
*/
|
|
|
|
if (!buffer_uptodate(bitmap_bh)) {
|
|
|
|
brelse(bitmap_bh);
|
|
|
|
goto make_io;
|
|
|
|
}
|
2008-10-10 05:53:47 +02:00
|
|
|
for (i = start; i < start + inodes_per_block; i++) {
|
2006-10-11 10:20:50 +02:00
|
|
|
if (i == inode_offset)
|
|
|
|
continue;
|
2006-10-11 10:20:53 +02:00
|
|
|
if (ext4_test_bit(i, bitmap_bh->b_data))
|
2006-10-11 10:20:50 +02:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
brelse(bitmap_bh);
|
2008-10-10 05:53:47 +02:00
|
|
|
if (i == start + inodes_per_block) {
|
2006-10-11 10:20:50 +02:00
|
|
|
/* all other inodes are free, so skip I/O */
|
|
|
|
memset(bh->b_data, 0, bh->b_size);
|
|
|
|
set_buffer_uptodate(bh);
|
|
|
|
unlock_buffer(bh);
|
|
|
|
goto has_buffer;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
make_io:
|
2008-10-10 05:53:47 +02:00
|
|
|
/*
|
|
|
|
* If we need to do any I/O, try to pre-readahead extra
|
|
|
|
* blocks from the inode table.
|
|
|
|
*/
|
|
|
|
if (EXT4_SB(sb)->s_inode_readahead_blks) {
|
|
|
|
ext4_fsblk_t b, end, table;
|
|
|
|
unsigned num;
|
|
|
|
|
|
|
|
table = ext4_inode_table(sb, gdp);
|
2009-03-31 15:11:14 +02:00
|
|
|
/* s_inode_readahead_blks is always a power of 2 */
|
2008-10-10 05:53:47 +02:00
|
|
|
b = block & ~(EXT4_SB(sb)->s_inode_readahead_blks-1);
|
|
|
|
if (table > b)
|
|
|
|
b = table;
|
|
|
|
end = b + EXT4_SB(sb)->s_inode_readahead_blks;
|
|
|
|
num = EXT4_INODES_PER_GROUP(sb);
|
|
|
|
if (EXT4_HAS_RO_COMPAT_FEATURE(sb,
|
|
|
|
EXT4_FEATURE_RO_COMPAT_GDT_CSUM))
|
2009-01-06 04:20:24 +01:00
|
|
|
num -= ext4_itable_unused_count(sb, gdp);
|
2008-10-10 05:53:47 +02:00
|
|
|
table += num / inodes_per_block;
|
|
|
|
if (end > table)
|
|
|
|
end = table;
|
|
|
|
while (b <= end)
|
|
|
|
sb_breadahead(sb, b++);
|
|
|
|
}
|
|
|
|
|
2006-10-11 10:20:50 +02:00
|
|
|
/*
|
|
|
|
* There are other valid inodes in the buffer, this inode
|
|
|
|
* has in-inode xattrs, or we don't have this inode in memory.
|
|
|
|
* Read the block from disk.
|
|
|
|
*/
|
2011-03-22 02:38:05 +01:00
|
|
|
trace_ext4_load_inode(inode);
|
2006-10-11 10:20:50 +02:00
|
|
|
get_bh(bh);
|
|
|
|
bh->b_end_io = end_buffer_read_sync;
|
|
|
|
submit_bh(READ_META, bh);
|
|
|
|
wait_on_buffer(bh);
|
|
|
|
if (!buffer_uptodate(bh)) {
|
2010-07-27 17:56:40 +02:00
|
|
|
EXT4_ERROR_INODE_BLOCK(inode, block,
|
|
|
|
"unable to read itable block");
|
2006-10-11 10:20:50 +02:00
|
|
|
brelse(bh);
|
|
|
|
return -EIO;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
has_buffer:
|
|
|
|
iloc->bh = bh;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2006-10-11 10:20:53 +02:00
|
|
|
int ext4_get_inode_loc(struct inode *inode, struct ext4_iloc *iloc)
|
2006-10-11 10:20:50 +02:00
|
|
|
{
|
|
|
|
/* We have all inode data except xattrs in memory here. */
|
2006-10-11 10:20:53 +02:00
|
|
|
return __ext4_get_inode_loc(inode, iloc,
|
2010-01-24 20:34:07 +01:00
|
|
|
!ext4_test_inode_state(inode, EXT4_STATE_XATTR));
|
2006-10-11 10:20:50 +02:00
|
|
|
}
|
|
|
|
|
2006-10-11 10:20:53 +02:00
|
|
|
void ext4_set_inode_flags(struct inode *inode)
|
2006-10-11 10:20:50 +02:00
|
|
|
{
|
2006-10-11 10:20:53 +02:00
|
|
|
unsigned int flags = EXT4_I(inode)->i_flags;
|
2006-10-11 10:20:50 +02:00
|
|
|
|
|
|
|
inode->i_flags &= ~(S_SYNC|S_APPEND|S_IMMUTABLE|S_NOATIME|S_DIRSYNC);
|
2006-10-11 10:20:53 +02:00
|
|
|
if (flags & EXT4_SYNC_FL)
|
2006-10-11 10:20:50 +02:00
|
|
|
inode->i_flags |= S_SYNC;
|
2006-10-11 10:20:53 +02:00
|
|
|
if (flags & EXT4_APPEND_FL)
|
2006-10-11 10:20:50 +02:00
|
|
|
inode->i_flags |= S_APPEND;
|
2006-10-11 10:20:53 +02:00
|
|
|
if (flags & EXT4_IMMUTABLE_FL)
|
2006-10-11 10:20:50 +02:00
|
|
|
inode->i_flags |= S_IMMUTABLE;
|
2006-10-11 10:20:53 +02:00
|
|
|
if (flags & EXT4_NOATIME_FL)
|
2006-10-11 10:20:50 +02:00
|
|
|
inode->i_flags |= S_NOATIME;
|
2006-10-11 10:20:53 +02:00
|
|
|
if (flags & EXT4_DIRSYNC_FL)
|
2006-10-11 10:20:50 +02:00
|
|
|
inode->i_flags |= S_DIRSYNC;
|
|
|
|
}
|
|
|
|
|
2007-07-18 15:24:20 +02:00
|
|
|
/* Propagate flags from i_flags to EXT4_I(inode)->i_flags */
|
|
|
|
void ext4_get_inode_flags(struct ext4_inode_info *ei)
|
|
|
|
{
|
2010-06-05 17:51:27 +02:00
|
|
|
unsigned int vfs_fl;
|
|
|
|
unsigned long old_fl, new_fl;
|
|
|
|
|
|
|
|
do {
|
|
|
|
vfs_fl = ei->vfs_inode.i_flags;
|
|
|
|
old_fl = ei->i_flags;
|
|
|
|
new_fl = old_fl & ~(EXT4_SYNC_FL|EXT4_APPEND_FL|
|
|
|
|
EXT4_IMMUTABLE_FL|EXT4_NOATIME_FL|
|
|
|
|
EXT4_DIRSYNC_FL);
|
|
|
|
if (vfs_fl & S_SYNC)
|
|
|
|
new_fl |= EXT4_SYNC_FL;
|
|
|
|
if (vfs_fl & S_APPEND)
|
|
|
|
new_fl |= EXT4_APPEND_FL;
|
|
|
|
if (vfs_fl & S_IMMUTABLE)
|
|
|
|
new_fl |= EXT4_IMMUTABLE_FL;
|
|
|
|
if (vfs_fl & S_NOATIME)
|
|
|
|
new_fl |= EXT4_NOATIME_FL;
|
|
|
|
if (vfs_fl & S_DIRSYNC)
|
|
|
|
new_fl |= EXT4_DIRSYNC_FL;
|
|
|
|
} while (cmpxchg(&ei->i_flags, old_fl, new_fl) != old_fl);
|
2007-07-18 15:24:20 +02:00
|
|
|
}
|
2009-06-14 23:45:34 +02:00
|
|
|
|
2008-01-29 05:58:26 +01:00
|
|
|
static blkcnt_t ext4_inode_blocks(struct ext4_inode *raw_inode,
|
2009-06-14 23:45:34 +02:00
|
|
|
struct ext4_inode_info *ei)
|
2008-01-29 05:58:26 +01:00
|
|
|
{
|
|
|
|
blkcnt_t i_blocks ;
|
2008-01-29 05:58:27 +01:00
|
|
|
struct inode *inode = &(ei->vfs_inode);
|
|
|
|
struct super_block *sb = inode->i_sb;
|
2008-01-29 05:58:26 +01:00
|
|
|
|
|
|
|
if (EXT4_HAS_RO_COMPAT_FEATURE(sb,
|
|
|
|
EXT4_FEATURE_RO_COMPAT_HUGE_FILE)) {
|
|
|
|
/* we are using combined 48 bit field */
|
|
|
|
i_blocks = ((u64)le16_to_cpu(raw_inode->i_blocks_high)) << 32 |
|
|
|
|
le32_to_cpu(raw_inode->i_blocks_lo);
|
2010-06-14 15:54:48 +02:00
|
|
|
if (ext4_test_inode_flag(inode, EXT4_INODE_HUGE_FILE)) {
|
2008-01-29 05:58:27 +01:00
|
|
|
/* i_blocks represent file system block size */
|
|
|
|
return i_blocks << (inode->i_blkbits - 9);
|
|
|
|
} else {
|
|
|
|
return i_blocks;
|
|
|
|
}
|
2008-01-29 05:58:26 +01:00
|
|
|
} else {
|
|
|
|
return le32_to_cpu(raw_inode->i_blocks_lo);
|
|
|
|
}
|
|
|
|
}
|
2007-07-18 15:24:20 +02:00
|
|
|
|
2008-02-07 09:15:37 +01:00
|
|
|
struct inode *ext4_iget(struct super_block *sb, unsigned long ino)
|
2006-10-11 10:20:50 +02:00
|
|
|
{
|
2006-10-11 10:20:53 +02:00
|
|
|
struct ext4_iloc iloc;
|
|
|
|
struct ext4_inode *raw_inode;
|
2008-02-07 09:15:37 +01:00
|
|
|
struct ext4_inode_info *ei;
|
|
|
|
struct inode *inode;
|
2009-12-09 05:51:10 +01:00
|
|
|
journal_t *journal = EXT4_SB(sb)->s_journal;
|
2008-02-07 09:15:37 +01:00
|
|
|
long ret;
|
2006-10-11 10:20:50 +02:00
|
|
|
int block;
|
|
|
|
|
2008-02-07 09:15:37 +01:00
|
|
|
inode = iget_locked(sb, ino);
|
|
|
|
if (!inode)
|
|
|
|
return ERR_PTR(-ENOMEM);
|
|
|
|
if (!(inode->i_state & I_NEW))
|
|
|
|
return inode;
|
|
|
|
|
|
|
|
ei = EXT4_I(inode);
|
2011-02-22 03:01:42 +01:00
|
|
|
iloc.bh = NULL;
|
2006-10-11 10:20:50 +02:00
|
|
|
|
2008-02-07 09:15:37 +01:00
|
|
|
ret = __ext4_get_inode_loc(inode, &iloc, 0);
|
|
|
|
if (ret < 0)
|
2006-10-11 10:20:50 +02:00
|
|
|
goto bad_inode;
|
2006-10-11 10:20:53 +02:00
|
|
|
raw_inode = ext4_raw_inode(&iloc);
|
2006-10-11 10:20:50 +02:00
|
|
|
inode->i_mode = le16_to_cpu(raw_inode->i_mode);
|
|
|
|
inode->i_uid = (uid_t)le16_to_cpu(raw_inode->i_uid_low);
|
|
|
|
inode->i_gid = (gid_t)le16_to_cpu(raw_inode->i_gid_low);
|
2008-09-09 04:25:24 +02:00
|
|
|
if (!(test_opt(inode->i_sb, NO_UID32))) {
|
2006-10-11 10:20:50 +02:00
|
|
|
inode->i_uid |= le16_to_cpu(raw_inode->i_uid_high) << 16;
|
|
|
|
inode->i_gid |= le16_to_cpu(raw_inode->i_gid_high) << 16;
|
|
|
|
}
|
|
|
|
inode->i_nlink = le16_to_cpu(raw_inode->i_links_count);
|
|
|
|
|
2011-01-10 18:18:25 +01:00
|
|
|
ext4_clear_state_flags(ei); /* Only relevant on 32-bit archs */
|
2006-10-11 10:20:50 +02:00
|
|
|
ei->i_dir_start_lookup = 0;
|
|
|
|
ei->i_dtime = le32_to_cpu(raw_inode->i_dtime);
|
|
|
|
/* We now have enough fields to check if the inode was active or not.
|
|
|
|
* This is needed because nfsd might try to access dead inodes
|
|
|
|
* the test is that same one that e2fsck uses
|
|
|
|
* NeilBrown 1999oct15
|
|
|
|
*/
|
|
|
|
if (inode->i_nlink == 0) {
|
|
|
|
if (inode->i_mode == 0 ||
|
2006-10-11 10:20:53 +02:00
|
|
|
!(EXT4_SB(inode->i_sb)->s_mount_state & EXT4_ORPHAN_FS)) {
|
2006-10-11 10:20:50 +02:00
|
|
|
/* this inode is deleted */
|
2008-02-07 09:15:37 +01:00
|
|
|
ret = -ESTALE;
|
2006-10-11 10:20:50 +02:00
|
|
|
goto bad_inode;
|
|
|
|
}
|
|
|
|
/* The only unlinked inodes we let through here have
|
|
|
|
* valid i_mode and are being read by the orphan
|
|
|
|
* recovery code: that's fine, we're about to complete
|
|
|
|
* the process of deleting those. */
|
|
|
|
}
|
|
|
|
ei->i_flags = le32_to_cpu(raw_inode->i_flags);
|
2008-01-29 05:58:26 +01:00
|
|
|
inode->i_blocks = ext4_inode_blocks(raw_inode, ei);
|
2008-01-29 05:58:27 +01:00
|
|
|
ei->i_file_acl = le32_to_cpu(raw_inode->i_file_acl_lo);
|
2009-04-24 22:11:18 +02:00
|
|
|
if (EXT4_HAS_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_64BIT))
|
2006-10-11 10:21:09 +02:00
|
|
|
ei->i_file_acl |=
|
|
|
|
((__u64)le16_to_cpu(raw_inode->i_file_acl_high)) << 32;
|
2008-01-29 05:58:27 +01:00
|
|
|
inode->i_size = ext4_isize(raw_inode);
|
2006-10-11 10:20:50 +02:00
|
|
|
ei->i_disksize = inode->i_size;
|
2009-12-14 13:21:14 +01:00
|
|
|
#ifdef CONFIG_QUOTA
|
|
|
|
ei->i_reserved_quota = 0;
|
|
|
|
#endif
|
2006-10-11 10:20:50 +02:00
|
|
|
inode->i_generation = le32_to_cpu(raw_inode->i_generation);
|
|
|
|
ei->i_block_group = iloc.block_group;
|
2009-03-12 17:18:34 +01:00
|
|
|
ei->i_last_alloc_group = ~0;
|
2006-10-11 10:20:50 +02:00
|
|
|
/*
|
|
|
|
* NOTE! The in-memory inode i_data array is in little-endian order
|
|
|
|
* even on big-endian machines: we do NOT byteswap the block numbers!
|
|
|
|
*/
|
2006-10-11 10:20:53 +02:00
|
|
|
for (block = 0; block < EXT4_N_BLOCKS; block++)
|
2006-10-11 10:20:50 +02:00
|
|
|
ei->i_data[block] = raw_inode->i_block[block];
|
|
|
|
INIT_LIST_HEAD(&ei->i_orphan);
|
|
|
|
|
2009-12-09 05:51:10 +01:00
|
|
|
/*
|
|
|
|
* Set transaction id's of transactions that have to be committed
|
|
|
|
* to finish f[data]sync. We set them to currently running transaction
|
|
|
|
* as we cannot be sure that the inode or some of its metadata isn't
|
|
|
|
* part of the transaction - the inode could have been reclaimed and
|
|
|
|
* now it is reread from disk.
|
|
|
|
*/
|
|
|
|
if (journal) {
|
|
|
|
transaction_t *transaction;
|
|
|
|
tid_t tid;
|
|
|
|
|
2010-08-04 03:35:12 +02:00
|
|
|
read_lock(&journal->j_state_lock);
|
2009-12-09 05:51:10 +01:00
|
|
|
if (journal->j_running_transaction)
|
|
|
|
transaction = journal->j_running_transaction;
|
|
|
|
else
|
|
|
|
transaction = journal->j_committing_transaction;
|
|
|
|
if (transaction)
|
|
|
|
tid = transaction->t_tid;
|
|
|
|
else
|
|
|
|
tid = journal->j_commit_sequence;
|
2010-08-04 03:35:12 +02:00
|
|
|
read_unlock(&journal->j_state_lock);
|
2009-12-09 05:51:10 +01:00
|
|
|
ei->i_sync_tid = tid;
|
|
|
|
ei->i_datasync_tid = tid;
|
|
|
|
}
|
|
|
|
|
2008-02-06 04:36:43 +01:00
|
|
|
if (EXT4_INODE_SIZE(inode->i_sb) > EXT4_GOOD_OLD_INODE_SIZE) {
|
2006-10-11 10:20:50 +02:00
|
|
|
ei->i_extra_isize = le16_to_cpu(raw_inode->i_extra_isize);
|
2006-10-11 10:20:53 +02:00
|
|
|
if (EXT4_GOOD_OLD_INODE_SIZE + ei->i_extra_isize >
|
2007-06-24 02:16:51 +02:00
|
|
|
EXT4_INODE_SIZE(inode->i_sb)) {
|
2008-02-07 09:15:37 +01:00
|
|
|
ret = -EIO;
|
2006-10-11 10:20:50 +02:00
|
|
|
goto bad_inode;
|
2007-06-24 02:16:51 +02:00
|
|
|
}
|
2006-10-11 10:20:50 +02:00
|
|
|
if (ei->i_extra_isize == 0) {
|
|
|
|
/* The extra space is currently unused. Use it. */
|
2006-10-11 10:20:53 +02:00
|
|
|
ei->i_extra_isize = sizeof(struct ext4_inode) -
|
|
|
|
EXT4_GOOD_OLD_INODE_SIZE;
|
2006-10-11 10:20:50 +02:00
|
|
|
} else {
|
|
|
|
__le32 *magic = (void *)raw_inode +
|
2006-10-11 10:20:53 +02:00
|
|
|
EXT4_GOOD_OLD_INODE_SIZE +
|
2006-10-11 10:20:50 +02:00
|
|
|
ei->i_extra_isize;
|
2006-10-11 10:20:53 +02:00
|
|
|
if (*magic == cpu_to_le32(EXT4_XATTR_MAGIC))
|
2010-01-24 20:34:07 +01:00
|
|
|
ext4_set_inode_state(inode, EXT4_STATE_XATTR);
|
2006-10-11 10:20:50 +02:00
|
|
|
}
|
|
|
|
} else
|
|
|
|
ei->i_extra_isize = 0;
|
|
|
|
|
2007-07-18 15:15:20 +02:00
|
|
|
EXT4_INODE_GET_XTIME(i_ctime, inode, raw_inode);
|
|
|
|
EXT4_INODE_GET_XTIME(i_mtime, inode, raw_inode);
|
|
|
|
EXT4_INODE_GET_XTIME(i_atime, inode, raw_inode);
|
|
|
|
EXT4_EINODE_GET_XTIME(i_crtime, ei, raw_inode);
|
|
|
|
|
2008-01-29 05:58:27 +01:00
|
|
|
inode->i_version = le32_to_cpu(raw_inode->i_disk_version);
|
|
|
|
if (EXT4_INODE_SIZE(inode->i_sb) > EXT4_GOOD_OLD_INODE_SIZE) {
|
|
|
|
if (EXT4_FITS_IN_INODE(raw_inode, ei, i_version_hi))
|
|
|
|
inode->i_version |=
|
|
|
|
(__u64)(le32_to_cpu(raw_inode->i_version_hi)) << 32;
|
|
|
|
}
|
|
|
|
|
ext4: Do not try to validate extents on special files
The EXTENTS_FL flag should never be set on special files, but if it
is, don't bother trying to validate that the extents tree is valid,
since only files, directories, and non-fast symlinks will ever have an
extent data structure. We perhaps should flag the filesystem as being
corrupted if we see a special file (named pipes, device nodes, Unix
domain sockets, etc.) with the EXTENTS_FL flag, but e2fsck doesn't
currently check this case, so we'll just ignore this for now, since
it's harmless.
Without this fix, a special device with the extents flag is flagged as
an error by the kernel, so it is impossible to access or delete the
inode, but e2fsck doesn't see it as a problem, leading to
confused/frustrated users.
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-04-25 00:45:35 +02:00
|
|
|
ret = 0;
|
2009-04-24 19:43:20 +02:00
|
|
|
if (ei->i_file_acl &&
|
2009-11-15 21:29:56 +01:00
|
|
|
!ext4_data_block_valid(EXT4_SB(sb), ei->i_file_acl, 1)) {
|
2010-05-17 03:00:00 +02:00
|
|
|
EXT4_ERROR_INODE(inode, "bad extended attribute block %llu",
|
|
|
|
ei->i_file_acl);
|
2009-04-24 19:43:20 +02:00
|
|
|
ret = -EIO;
|
|
|
|
goto bad_inode;
|
2010-06-14 15:54:48 +02:00
|
|
|
} else if (ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS)) {
|
ext4: Do not try to validate extents on special files
The EXTENTS_FL flag should never be set on special files, but if it
is, don't bother trying to validate that the extents tree is valid,
since only files, directories, and non-fast symlinks will ever have an
extent data structure. We perhaps should flag the filesystem as being
corrupted if we see a special file (named pipes, device nodes, Unix
domain sockets, etc.) with the EXTENTS_FL flag, but e2fsck doesn't
currently check this case, so we'll just ignore this for now, since
it's harmless.
Without this fix, a special device with the extents flag is flagged as
an error by the kernel, so it is impossible to access or delete the
inode, but e2fsck doesn't see it as a problem, leading to
confused/frustrated users.
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-04-25 00:45:35 +02:00
|
|
|
if (S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode) ||
|
|
|
|
(S_ISLNK(inode->i_mode) &&
|
|
|
|
!ext4_inode_is_fast_symlink(inode)))
|
|
|
|
/* Validate extent which is part of inode */
|
|
|
|
ret = ext4_ext_check_inode(inode);
|
2009-06-14 23:45:34 +02:00
|
|
|
} else if (S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode) ||
|
2009-03-31 14:36:10 +02:00
|
|
|
(S_ISLNK(inode->i_mode) &&
|
|
|
|
!ext4_inode_is_fast_symlink(inode))) {
|
2009-06-14 23:45:34 +02:00
|
|
|
/* Validate block references which are part of inode */
|
2011-06-28 01:16:02 +02:00
|
|
|
ret = ext4_ind_check_inode(inode);
|
2009-03-31 14:36:10 +02:00
|
|
|
}
|
2009-11-14 14:19:05 +01:00
|
|
|
if (ret)
|
2009-06-14 23:45:34 +02:00
|
|
|
goto bad_inode;
|
2009-03-27 21:39:58 +01:00
|
|
|
|
2006-10-11 10:20:50 +02:00
|
|
|
if (S_ISREG(inode->i_mode)) {
|
2006-10-11 10:20:53 +02:00
|
|
|
inode->i_op = &ext4_file_inode_operations;
|
|
|
|
inode->i_fop = &ext4_file_operations;
|
|
|
|
ext4_set_aops(inode);
|
2006-10-11 10:20:50 +02:00
|
|
|
} else if (S_ISDIR(inode->i_mode)) {
|
2006-10-11 10:20:53 +02:00
|
|
|
inode->i_op = &ext4_dir_inode_operations;
|
|
|
|
inode->i_fop = &ext4_dir_operations;
|
2006-10-11 10:20:50 +02:00
|
|
|
} else if (S_ISLNK(inode->i_mode)) {
|
2008-12-19 21:47:15 +01:00
|
|
|
if (ext4_inode_is_fast_symlink(inode)) {
|
2006-10-11 10:20:53 +02:00
|
|
|
inode->i_op = &ext4_fast_symlink_inode_operations;
|
2008-12-19 21:47:15 +01:00
|
|
|
nd_terminate_link(ei->i_data, inode->i_size,
|
|
|
|
sizeof(ei->i_data) - 1);
|
|
|
|
} else {
|
2006-10-11 10:20:53 +02:00
|
|
|
inode->i_op = &ext4_symlink_inode_operations;
|
|
|
|
ext4_set_aops(inode);
|
2006-10-11 10:20:50 +02:00
|
|
|
}
|
2009-03-26 05:06:19 +01:00
|
|
|
} else if (S_ISCHR(inode->i_mode) || S_ISBLK(inode->i_mode) ||
|
|
|
|
S_ISFIFO(inode->i_mode) || S_ISSOCK(inode->i_mode)) {
|
2006-10-11 10:20:53 +02:00
|
|
|
inode->i_op = &ext4_special_inode_operations;
|
2006-10-11 10:20:50 +02:00
|
|
|
if (raw_inode->i_block[0])
|
|
|
|
init_special_inode(inode, inode->i_mode,
|
|
|
|
old_decode_dev(le32_to_cpu(raw_inode->i_block[0])));
|
|
|
|
else
|
|
|
|
init_special_inode(inode, inode->i_mode,
|
|
|
|
new_decode_dev(le32_to_cpu(raw_inode->i_block[1])));
|
2009-03-26 05:06:19 +01:00
|
|
|
} else {
|
|
|
|
ret = -EIO;
|
2010-05-17 03:00:00 +02:00
|
|
|
EXT4_ERROR_INODE(inode, "bogus i_mode (%o)", inode->i_mode);
|
2009-03-26 05:06:19 +01:00
|
|
|
goto bad_inode;
|
2006-10-11 10:20:50 +02:00
|
|
|
}
|
2008-09-09 04:25:24 +02:00
|
|
|
brelse(iloc.bh);
|
2006-10-11 10:20:53 +02:00
|
|
|
ext4_set_inode_flags(inode);
|
2008-02-07 09:15:37 +01:00
|
|
|
unlock_new_inode(inode);
|
|
|
|
return inode;
|
2006-10-11 10:20:50 +02:00
|
|
|
|
|
|
|
bad_inode:
|
2009-11-14 14:19:05 +01:00
|
|
|
brelse(iloc.bh);
|
2008-02-07 09:15:37 +01:00
|
|
|
iget_failed(inode);
|
|
|
|
return ERR_PTR(ret);
|
2006-10-11 10:20:50 +02:00
|
|
|
}
|
|
|
|
|
2008-01-29 05:58:26 +01:00
|
|
|
static int ext4_inode_blocks_set(handle_t *handle,
|
|
|
|
struct ext4_inode *raw_inode,
|
|
|
|
struct ext4_inode_info *ei)
|
|
|
|
{
|
|
|
|
struct inode *inode = &(ei->vfs_inode);
|
|
|
|
u64 i_blocks = inode->i_blocks;
|
|
|
|
struct super_block *sb = inode->i_sb;
|
|
|
|
|
|
|
|
if (i_blocks <= ~0U) {
|
|
|
|
/*
|
|
|
|
* i_blocks can be represnted in a 32 bit variable
|
|
|
|
* as multiple of 512 bytes
|
|
|
|
*/
|
2008-01-29 05:58:27 +01:00
|
|
|
raw_inode->i_blocks_lo = cpu_to_le32(i_blocks);
|
2008-01-29 05:58:26 +01:00
|
|
|
raw_inode->i_blocks_high = 0;
|
2010-06-05 17:51:27 +02:00
|
|
|
ext4_clear_inode_flag(inode, EXT4_INODE_HUGE_FILE);
|
2008-10-17 04:50:48 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
if (!EXT4_HAS_RO_COMPAT_FEATURE(sb, EXT4_FEATURE_RO_COMPAT_HUGE_FILE))
|
|
|
|
return -EFBIG;
|
|
|
|
|
|
|
|
if (i_blocks <= 0xffffffffffffULL) {
|
2008-01-29 05:58:26 +01:00
|
|
|
/*
|
|
|
|
* i_blocks can be represented in a 48 bit variable
|
|
|
|
* as multiple of 512 bytes
|
|
|
|
*/
|
2008-01-29 05:58:27 +01:00
|
|
|
raw_inode->i_blocks_lo = cpu_to_le32(i_blocks);
|
2008-01-29 05:58:26 +01:00
|
|
|
raw_inode->i_blocks_high = cpu_to_le16(i_blocks >> 32);
|
2010-06-05 17:51:27 +02:00
|
|
|
ext4_clear_inode_flag(inode, EXT4_INODE_HUGE_FILE);
|
2008-01-29 05:58:26 +01:00
|
|
|
} else {
|
2010-06-05 17:51:27 +02:00
|
|
|
ext4_set_inode_flag(inode, EXT4_INODE_HUGE_FILE);
|
2008-01-29 05:58:27 +01:00
|
|
|
/* i_block is stored in file system block size */
|
|
|
|
i_blocks = i_blocks >> (inode->i_blkbits - 9);
|
|
|
|
raw_inode->i_blocks_lo = cpu_to_le32(i_blocks);
|
|
|
|
raw_inode->i_blocks_high = cpu_to_le16(i_blocks >> 32);
|
2008-01-29 05:58:26 +01:00
|
|
|
}
|
2008-10-17 04:50:48 +02:00
|
|
|
return 0;
|
2008-01-29 05:58:26 +01:00
|
|
|
}
|
|
|
|
|
2006-10-11 10:20:50 +02:00
|
|
|
/*
|
|
|
|
* Post the struct inode info into an on-disk inode location in the
|
|
|
|
* buffer-cache. This gobbles the caller's reference to the
|
|
|
|
* buffer_head in the inode location struct.
|
|
|
|
*
|
|
|
|
* The caller must have write access to iloc->bh.
|
|
|
|
*/
|
2006-10-11 10:20:53 +02:00
|
|
|
static int ext4_do_update_inode(handle_t *handle,
|
2006-10-11 10:20:50 +02:00
|
|
|
struct inode *inode,
|
2009-09-29 16:07:47 +02:00
|
|
|
struct ext4_iloc *iloc)
|
2006-10-11 10:20:50 +02:00
|
|
|
{
|
2006-10-11 10:20:53 +02:00
|
|
|
struct ext4_inode *raw_inode = ext4_raw_inode(iloc);
|
|
|
|
struct ext4_inode_info *ei = EXT4_I(inode);
|
2006-10-11 10:20:50 +02:00
|
|
|
struct buffer_head *bh = iloc->bh;
|
|
|
|
int err = 0, rc, block;
|
|
|
|
|
|
|
|
/* For fields not not tracking in the in-memory inode,
|
|
|
|
* initialise them to zero for new inodes. */
|
2010-01-24 20:34:07 +01:00
|
|
|
if (ext4_test_inode_state(inode, EXT4_STATE_NEW))
|
2006-10-11 10:20:53 +02:00
|
|
|
memset(raw_inode, 0, EXT4_SB(inode->i_sb)->s_inode_size);
|
2006-10-11 10:20:50 +02:00
|
|
|
|
2007-07-18 15:24:20 +02:00
|
|
|
ext4_get_inode_flags(ei);
|
2006-10-11 10:20:50 +02:00
|
|
|
raw_inode->i_mode = cpu_to_le16(inode->i_mode);
|
2008-09-09 04:25:24 +02:00
|
|
|
if (!(test_opt(inode->i_sb, NO_UID32))) {
|
2006-10-11 10:20:50 +02:00
|
|
|
raw_inode->i_uid_low = cpu_to_le16(low_16_bits(inode->i_uid));
|
|
|
|
raw_inode->i_gid_low = cpu_to_le16(low_16_bits(inode->i_gid));
|
|
|
|
/*
|
|
|
|
* Fix up interoperability with old kernels. Otherwise, old inodes get
|
|
|
|
* re-used with the upper 16 bits of the uid/gid intact
|
|
|
|
*/
|
2008-09-09 04:25:24 +02:00
|
|
|
if (!ei->i_dtime) {
|
2006-10-11 10:20:50 +02:00
|
|
|
raw_inode->i_uid_high =
|
|
|
|
cpu_to_le16(high_16_bits(inode->i_uid));
|
|
|
|
raw_inode->i_gid_high =
|
|
|
|
cpu_to_le16(high_16_bits(inode->i_gid));
|
|
|
|
} else {
|
|
|
|
raw_inode->i_uid_high = 0;
|
|
|
|
raw_inode->i_gid_high = 0;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
raw_inode->i_uid_low =
|
|
|
|
cpu_to_le16(fs_high2lowuid(inode->i_uid));
|
|
|
|
raw_inode->i_gid_low =
|
|
|
|
cpu_to_le16(fs_high2lowgid(inode->i_gid));
|
|
|
|
raw_inode->i_uid_high = 0;
|
|
|
|
raw_inode->i_gid_high = 0;
|
|
|
|
}
|
|
|
|
raw_inode->i_links_count = cpu_to_le16(inode->i_nlink);
|
2007-07-18 15:15:20 +02:00
|
|
|
|
|
|
|
EXT4_INODE_SET_XTIME(i_ctime, inode, raw_inode);
|
|
|
|
EXT4_INODE_SET_XTIME(i_mtime, inode, raw_inode);
|
|
|
|
EXT4_INODE_SET_XTIME(i_atime, inode, raw_inode);
|
|
|
|
EXT4_EINODE_SET_XTIME(i_crtime, ei, raw_inode);
|
|
|
|
|
2008-01-29 05:58:26 +01:00
|
|
|
if (ext4_inode_blocks_set(handle, raw_inode, ei))
|
|
|
|
goto out_brelse;
|
2006-10-11 10:20:50 +02:00
|
|
|
raw_inode->i_dtime = cpu_to_le32(ei->i_dtime);
|
2011-01-10 18:18:25 +01:00
|
|
|
raw_inode->i_flags = cpu_to_le32(ei->i_flags & 0xFFFFFFFF);
|
2006-10-11 10:21:13 +02:00
|
|
|
if (EXT4_SB(inode->i_sb)->s_es->s_creator_os !=
|
|
|
|
cpu_to_le32(EXT4_OS_HURD))
|
2006-10-11 10:21:09 +02:00
|
|
|
raw_inode->i_file_acl_high =
|
|
|
|
cpu_to_le16(ei->i_file_acl >> 32);
|
2008-01-29 05:58:27 +01:00
|
|
|
raw_inode->i_file_acl_lo = cpu_to_le32(ei->i_file_acl);
|
2008-01-29 05:58:27 +01:00
|
|
|
ext4_isize_set(raw_inode, ei->i_disksize);
|
|
|
|
if (ei->i_disksize > 0x7fffffffULL) {
|
|
|
|
struct super_block *sb = inode->i_sb;
|
|
|
|
if (!EXT4_HAS_RO_COMPAT_FEATURE(sb,
|
|
|
|
EXT4_FEATURE_RO_COMPAT_LARGE_FILE) ||
|
|
|
|
EXT4_SB(sb)->s_es->s_rev_level ==
|
|
|
|
cpu_to_le32(EXT4_GOOD_OLD_REV)) {
|
|
|
|
/* If this is the first large file
|
|
|
|
* created, add a flag to the superblock.
|
|
|
|
*/
|
|
|
|
err = ext4_journal_get_write_access(handle,
|
|
|
|
EXT4_SB(sb)->s_sbh);
|
|
|
|
if (err)
|
|
|
|
goto out_brelse;
|
|
|
|
ext4_update_dynamic_rev(sb);
|
|
|
|
EXT4_SET_RO_COMPAT_FEATURE(sb,
|
2006-10-11 10:20:53 +02:00
|
|
|
EXT4_FEATURE_RO_COMPAT_LARGE_FILE);
|
2008-01-29 05:58:27 +01:00
|
|
|
sb->s_dirt = 1;
|
2009-01-07 06:06:22 +01:00
|
|
|
ext4_handle_sync(handle);
|
2010-02-16 21:06:29 +01:00
|
|
|
err = ext4_handle_dirty_metadata(handle, NULL,
|
2008-01-29 05:58:27 +01:00
|
|
|
EXT4_SB(sb)->s_sbh);
|
2006-10-11 10:20:50 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
raw_inode->i_generation = cpu_to_le32(inode->i_generation);
|
|
|
|
if (S_ISCHR(inode->i_mode) || S_ISBLK(inode->i_mode)) {
|
|
|
|
if (old_valid_dev(inode->i_rdev)) {
|
|
|
|
raw_inode->i_block[0] =
|
|
|
|
cpu_to_le32(old_encode_dev(inode->i_rdev));
|
|
|
|
raw_inode->i_block[1] = 0;
|
|
|
|
} else {
|
|
|
|
raw_inode->i_block[0] = 0;
|
|
|
|
raw_inode->i_block[1] =
|
|
|
|
cpu_to_le32(new_encode_dev(inode->i_rdev));
|
|
|
|
raw_inode->i_block[2] = 0;
|
|
|
|
}
|
2009-06-14 23:45:34 +02:00
|
|
|
} else
|
|
|
|
for (block = 0; block < EXT4_N_BLOCKS; block++)
|
|
|
|
raw_inode->i_block[block] = ei->i_data[block];
|
2006-10-11 10:20:50 +02:00
|
|
|
|
2008-01-29 05:58:27 +01:00
|
|
|
raw_inode->i_disk_version = cpu_to_le32(inode->i_version);
|
|
|
|
if (ei->i_extra_isize) {
|
|
|
|
if (EXT4_FITS_IN_INODE(raw_inode, ei, i_version_hi))
|
|
|
|
raw_inode->i_version_hi =
|
|
|
|
cpu_to_le32(inode->i_version >> 32);
|
2006-10-11 10:20:50 +02:00
|
|
|
raw_inode->i_extra_isize = cpu_to_le16(ei->i_extra_isize);
|
2008-01-29 05:58:27 +01:00
|
|
|
}
|
|
|
|
|
2009-09-29 16:07:47 +02:00
|
|
|
BUFFER_TRACE(bh, "call ext4_handle_dirty_metadata");
|
2010-02-16 21:06:29 +01:00
|
|
|
rc = ext4_handle_dirty_metadata(handle, NULL, bh);
|
2009-09-29 16:07:47 +02:00
|
|
|
if (!err)
|
|
|
|
err = rc;
|
2010-01-24 20:34:07 +01:00
|
|
|
ext4_clear_inode_state(inode, EXT4_STATE_NEW);
|
2006-10-11 10:20:50 +02:00
|
|
|
|
2009-12-09 05:51:10 +01:00
|
|
|
ext4_update_inode_fsync_trans(handle, inode, 0);
|
2006-10-11 10:20:50 +02:00
|
|
|
out_brelse:
|
2008-09-09 04:25:24 +02:00
|
|
|
brelse(bh);
|
2006-10-11 10:20:53 +02:00
|
|
|
ext4_std_error(inode->i_sb, err);
|
2006-10-11 10:20:50 +02:00
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
2006-10-11 10:20:53 +02:00
|
|
|
* ext4_write_inode()
|
2006-10-11 10:20:50 +02:00
|
|
|
*
|
|
|
|
* We are called from a few places:
|
|
|
|
*
|
|
|
|
* - Within generic_file_write() for O_SYNC files.
|
|
|
|
* Here, there will be no transaction running. We wait for any running
|
|
|
|
* trasnaction to commit.
|
|
|
|
*
|
|
|
|
* - Within sys_sync(), kupdate and such.
|
|
|
|
* We wait on commit, if tol to.
|
|
|
|
*
|
|
|
|
* - Within prune_icache() (PF_MEMALLOC == true)
|
|
|
|
* Here we simply return. We can't afford to block kswapd on the
|
|
|
|
* journal commit.
|
|
|
|
*
|
|
|
|
* In all cases it is actually safe for us to return without doing anything,
|
|
|
|
* because the inode has been copied into a raw inode buffer in
|
2006-10-11 10:20:53 +02:00
|
|
|
* ext4_mark_inode_dirty(). This is a correctness thing for O_SYNC and for
|
2006-10-11 10:20:50 +02:00
|
|
|
* knfsd.
|
|
|
|
*
|
|
|
|
* Note that we are absolutely dependent upon all inode dirtiers doing the
|
|
|
|
* right thing: they *must* call mark_inode_dirty() after dirtying info in
|
|
|
|
* which we are interested.
|
|
|
|
*
|
|
|
|
* It would be a bug for them to not do this. The code:
|
|
|
|
*
|
|
|
|
* mark_inode_dirty(inode)
|
|
|
|
* stuff();
|
|
|
|
* inode->i_size = expr;
|
|
|
|
*
|
|
|
|
* is in error because a kswapd-driven write_inode() could occur while
|
|
|
|
* `stuff()' is running, and the new i_size will be lost. Plus the inode
|
|
|
|
* will no longer be on the superblock's dirty inode list.
|
|
|
|
*/
|
2010-03-05 09:21:37 +01:00
|
|
|
int ext4_write_inode(struct inode *inode, struct writeback_control *wbc)
|
2006-10-11 10:20:50 +02:00
|
|
|
{
|
2009-09-10 04:33:47 +02:00
|
|
|
int err;
|
|
|
|
|
2006-10-11 10:20:50 +02:00
|
|
|
if (current->flags & PF_MEMALLOC)
|
|
|
|
return 0;
|
|
|
|
|
2009-09-10 04:33:47 +02:00
|
|
|
if (EXT4_SB(inode->i_sb)->s_journal) {
|
|
|
|
if (ext4_journal_current_handle()) {
|
|
|
|
jbd_debug(1, "called recursively, non-PF_MEMALLOC!\n");
|
|
|
|
dump_stack();
|
|
|
|
return -EIO;
|
|
|
|
}
|
2006-10-11 10:20:50 +02:00
|
|
|
|
2010-03-05 09:21:37 +01:00
|
|
|
if (wbc->sync_mode != WB_SYNC_ALL)
|
2009-09-10 04:33:47 +02:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
err = ext4_force_commit(inode->i_sb);
|
|
|
|
} else {
|
|
|
|
struct ext4_iloc iloc;
|
2006-10-11 10:20:50 +02:00
|
|
|
|
2010-04-03 22:45:06 +02:00
|
|
|
err = __ext4_get_inode_loc(inode, &iloc, 0);
|
2009-09-10 04:33:47 +02:00
|
|
|
if (err)
|
|
|
|
return err;
|
2010-03-05 09:21:37 +01:00
|
|
|
if (wbc->sync_mode == WB_SYNC_ALL)
|
2009-09-29 16:07:47 +02:00
|
|
|
sync_dirty_buffer(iloc.bh);
|
|
|
|
if (buffer_req(iloc.bh) && !buffer_uptodate(iloc.bh)) {
|
2010-07-27 17:56:40 +02:00
|
|
|
EXT4_ERROR_INODE_BLOCK(inode, iloc.bh->b_blocknr,
|
|
|
|
"IO error syncing inode");
|
2009-09-29 16:07:47 +02:00
|
|
|
err = -EIO;
|
|
|
|
}
|
2010-04-03 23:44:16 +02:00
|
|
|
brelse(iloc.bh);
|
2009-09-10 04:33:47 +02:00
|
|
|
}
|
|
|
|
return err;
|
2006-10-11 10:20:50 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
2006-10-11 10:20:53 +02:00
|
|
|
* ext4_setattr()
|
2006-10-11 10:20:50 +02:00
|
|
|
*
|
|
|
|
* Called from notify_change.
|
|
|
|
*
|
|
|
|
* We want to trap VFS attempts to truncate the file as soon as
|
|
|
|
* possible. In particular, we want to make sure that when the VFS
|
|
|
|
* shrinks i_size, we put the inode on the orphan list and modify
|
|
|
|
* i_disksize immediately, so that during the subsequent flushing of
|
|
|
|
* dirty pages and freeing of disk blocks, we can guarantee that any
|
|
|
|
* commit will leave the blocks being flushed in an unused state on
|
|
|
|
* disk. (On recovery, the inode will get truncated and the blocks will
|
|
|
|
* be freed, so we have a strong guarantee that no future commit will
|
|
|
|
* leave these blocks visible to the user.)
|
|
|
|
*
|
2008-07-12 01:27:31 +02:00
|
|
|
* Another thing we have to assure is that if we are in ordered mode
|
|
|
|
* and inode is still attached to the committing transaction, we must
|
|
|
|
* we start writeout of all the dirty pages which are being truncated.
|
|
|
|
* This way we are sure that all the data written in the previous
|
|
|
|
* transaction are already on disk (truncate waits for pages under
|
|
|
|
* writeback).
|
|
|
|
*
|
|
|
|
* Called with inode->i_mutex down.
|
2006-10-11 10:20:50 +02:00
|
|
|
*/
|
2006-10-11 10:20:53 +02:00
|
|
|
int ext4_setattr(struct dentry *dentry, struct iattr *attr)
|
2006-10-11 10:20:50 +02:00
|
|
|
{
|
|
|
|
struct inode *inode = dentry->d_inode;
|
|
|
|
int error, rc = 0;
|
2010-10-28 04:08:46 +02:00
|
|
|
int orphan = 0;
|
2006-10-11 10:20:50 +02:00
|
|
|
const unsigned int ia_valid = attr->ia_valid;
|
|
|
|
|
|
|
|
error = inode_change_ok(inode, attr);
|
|
|
|
if (error)
|
|
|
|
return error;
|
|
|
|
|
2010-04-08 20:04:20 +02:00
|
|
|
if (is_quota_modification(inode, attr))
|
2010-03-03 15:05:07 +01:00
|
|
|
dquot_initialize(inode);
|
2006-10-11 10:20:50 +02:00
|
|
|
if ((ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) ||
|
|
|
|
(ia_valid & ATTR_GID && attr->ia_gid != inode->i_gid)) {
|
|
|
|
handle_t *handle;
|
|
|
|
|
|
|
|
/* (user+group)*(old+new) structure, inode write (sb,
|
|
|
|
* inode block, ? - but truncate inode update has it) */
|
2009-12-09 04:42:15 +01:00
|
|
|
handle = ext4_journal_start(inode, (EXT4_MAXQUOTAS_INIT_BLOCKS(inode->i_sb)+
|
2009-12-09 04:42:28 +01:00
|
|
|
EXT4_MAXQUOTAS_DEL_BLOCKS(inode->i_sb))+3);
|
2006-10-11 10:20:50 +02:00
|
|
|
if (IS_ERR(handle)) {
|
|
|
|
error = PTR_ERR(handle);
|
|
|
|
goto err_out;
|
|
|
|
}
|
2010-03-03 15:05:03 +01:00
|
|
|
error = dquot_transfer(inode, attr);
|
2006-10-11 10:20:50 +02:00
|
|
|
if (error) {
|
2006-10-11 10:20:53 +02:00
|
|
|
ext4_journal_stop(handle);
|
2006-10-11 10:20:50 +02:00
|
|
|
return error;
|
|
|
|
}
|
|
|
|
/* Update corresponding info in inode so that everything is in
|
|
|
|
* one transaction */
|
|
|
|
if (attr->ia_valid & ATTR_UID)
|
|
|
|
inode->i_uid = attr->ia_uid;
|
|
|
|
if (attr->ia_valid & ATTR_GID)
|
|
|
|
inode->i_gid = attr->ia_gid;
|
2006-10-11 10:20:53 +02:00
|
|
|
error = ext4_mark_inode_dirty(handle, inode);
|
|
|
|
ext4_journal_stop(handle);
|
2006-10-11 10:20:50 +02:00
|
|
|
}
|
|
|
|
|
2008-01-29 05:58:27 +01:00
|
|
|
if (attr->ia_valid & ATTR_SIZE) {
|
2011-06-24 20:29:45 +02:00
|
|
|
inode_dio_wait(inode);
|
|
|
|
|
2010-05-17 04:00:00 +02:00
|
|
|
if (!(ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS))) {
|
2008-01-29 05:58:27 +01:00
|
|
|
struct ext4_sb_info *sbi = EXT4_SB(inode->i_sb);
|
|
|
|
|
2010-07-27 17:56:06 +02:00
|
|
|
if (attr->ia_size > sbi->s_bitmap_maxbytes)
|
|
|
|
return -EFBIG;
|
2008-01-29 05:58:27 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-10-11 10:20:50 +02:00
|
|
|
if (S_ISREG(inode->i_mode) &&
|
2010-02-24 15:52:53 +01:00
|
|
|
attr->ia_valid & ATTR_SIZE &&
|
2011-05-23 21:13:02 +02:00
|
|
|
(attr->ia_size < inode->i_size)) {
|
2006-10-11 10:20:50 +02:00
|
|
|
handle_t *handle;
|
|
|
|
|
2006-10-11 10:20:53 +02:00
|
|
|
handle = ext4_journal_start(inode, 3);
|
2006-10-11 10:20:50 +02:00
|
|
|
if (IS_ERR(handle)) {
|
|
|
|
error = PTR_ERR(handle);
|
|
|
|
goto err_out;
|
|
|
|
}
|
2010-10-28 04:08:46 +02:00
|
|
|
if (ext4_handle_valid(handle)) {
|
|
|
|
error = ext4_orphan_add(handle, inode);
|
|
|
|
orphan = 1;
|
|
|
|
}
|
2006-10-11 10:20:53 +02:00
|
|
|
EXT4_I(inode)->i_disksize = attr->ia_size;
|
|
|
|
rc = ext4_mark_inode_dirty(handle, inode);
|
2006-10-11 10:20:50 +02:00
|
|
|
if (!error)
|
|
|
|
error = rc;
|
2006-10-11 10:20:53 +02:00
|
|
|
ext4_journal_stop(handle);
|
2008-07-12 01:27:31 +02:00
|
|
|
|
|
|
|
if (ext4_should_order_data(inode)) {
|
|
|
|
error = ext4_begin_ordered_truncate(inode,
|
|
|
|
attr->ia_size);
|
|
|
|
if (error) {
|
|
|
|
/* Do as much error cleanup as possible */
|
|
|
|
handle = ext4_journal_start(inode, 3);
|
|
|
|
if (IS_ERR(handle)) {
|
|
|
|
ext4_orphan_del(NULL, inode);
|
|
|
|
goto err_out;
|
|
|
|
}
|
|
|
|
ext4_orphan_del(handle, inode);
|
2010-10-28 04:08:46 +02:00
|
|
|
orphan = 0;
|
2008-07-12 01:27:31 +02:00
|
|
|
ext4_journal_stop(handle);
|
|
|
|
goto err_out;
|
|
|
|
}
|
|
|
|
}
|
2006-10-11 10:20:50 +02:00
|
|
|
}
|
|
|
|
|
2011-05-23 21:13:02 +02:00
|
|
|
if (attr->ia_valid & ATTR_SIZE) {
|
|
|
|
if (attr->ia_size != i_size_read(inode)) {
|
|
|
|
truncate_setsize(inode, attr->ia_size);
|
|
|
|
ext4_truncate(inode);
|
|
|
|
} else if (ext4_test_inode_flag(inode, EXT4_INODE_EOFBLOCKS))
|
|
|
|
ext4_truncate(inode);
|
|
|
|
}
|
2006-10-11 10:20:50 +02:00
|
|
|
|
2010-06-04 11:30:02 +02:00
|
|
|
if (!rc) {
|
|
|
|
setattr_copy(inode, attr);
|
|
|
|
mark_inode_dirty(inode);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If the call to ext4_truncate failed to get a transaction handle at
|
|
|
|
* all, we need to clean up the in-core orphan list manually.
|
|
|
|
*/
|
2010-10-28 04:08:46 +02:00
|
|
|
if (orphan && inode->i_nlink)
|
2006-10-11 10:20:53 +02:00
|
|
|
ext4_orphan_del(NULL, inode);
|
2006-10-11 10:20:50 +02:00
|
|
|
|
|
|
|
if (!rc && (ia_valid & ATTR_MODE))
|
2006-10-11 10:20:53 +02:00
|
|
|
rc = ext4_acl_chmod(inode);
|
2006-10-11 10:20:50 +02:00
|
|
|
|
|
|
|
err_out:
|
2006-10-11 10:20:53 +02:00
|
|
|
ext4_std_error(inode->i_sb, error);
|
2006-10-11 10:20:50 +02:00
|
|
|
if (!error)
|
|
|
|
error = rc;
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
2008-07-12 01:27:31 +02:00
|
|
|
int ext4_getattr(struct vfsmount *mnt, struct dentry *dentry,
|
|
|
|
struct kstat *stat)
|
|
|
|
{
|
|
|
|
struct inode *inode;
|
|
|
|
unsigned long delalloc_blocks;
|
|
|
|
|
|
|
|
inode = dentry->d_inode;
|
|
|
|
generic_fillattr(inode, stat);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* We can't update i_blocks if the block allocation is delayed
|
|
|
|
* otherwise in the case of system crash before the real block
|
|
|
|
* allocation is done, we will have i_blocks inconsistent with
|
|
|
|
* on-disk file blocks.
|
|
|
|
* We always keep i_blocks updated together with real
|
|
|
|
* allocation. But to not confuse with user, stat
|
|
|
|
* will return the blocks that include the delayed allocation
|
|
|
|
* blocks for this file.
|
|
|
|
*/
|
|
|
|
delalloc_blocks = EXT4_I(inode)->i_reserved_data_blocks;
|
|
|
|
|
|
|
|
stat->blocks += (delalloc_blocks << inode->i_sb->s_blocksize_bits)>>9;
|
|
|
|
return 0;
|
|
|
|
}
|
2006-10-11 10:20:50 +02:00
|
|
|
|
ext4: journal credits calulation cleanup and fix for non-extent writepage
When considering how many journal credits are needed for modifying a
chunk of data, we need to account for the super block, inode block,
quota blocks and xattr block, indirect/index blocks, also, group bitmap
and group descriptor blocks for new allocation (including data and
indirect/index blocks). There are many places in ext4 do the calculation
on their own and often missed one or two meta blocks, and often they
assume single block allocation, and did not considering the multile
chunk of allocation case.
This patch is trying to cleanup current journal credit code, provides
some common helper funtion to calculate the journal credits, to be used
for writepage, writepages, DIO, fallocate, migration, defrag, and for
both nonextent and extent files.
This patch modified the writepage/write_begin credit caculation for
nonextent files, to use the new helper function. It also fixed the
problem that writepage on nonextent files did not consider the case
blocksize <pagesize, thus could possibelly need multiple block
allocation in a single transaction.
Signed-off-by: Mingming Cao <cmm@us.ibm.com>
Reviewed-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-08-20 04:16:07 +02:00
|
|
|
static int ext4_index_trans_blocks(struct inode *inode, int nrblocks, int chunk)
|
|
|
|
{
|
2010-05-17 04:00:00 +02:00
|
|
|
if (!(ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS)))
|
2011-06-27 23:10:28 +02:00
|
|
|
return ext4_ind_trans_blocks(inode, nrblocks, chunk);
|
2008-11-06 22:49:36 +01:00
|
|
|
return ext4_ext_index_trans_blocks(inode, nrblocks, chunk);
|
ext4: journal credits calulation cleanup and fix for non-extent writepage
When considering how many journal credits are needed for modifying a
chunk of data, we need to account for the super block, inode block,
quota blocks and xattr block, indirect/index blocks, also, group bitmap
and group descriptor blocks for new allocation (including data and
indirect/index blocks). There are many places in ext4 do the calculation
on their own and often missed one or two meta blocks, and often they
assume single block allocation, and did not considering the multile
chunk of allocation case.
This patch is trying to cleanup current journal credit code, provides
some common helper funtion to calculate the journal credits, to be used
for writepage, writepages, DIO, fallocate, migration, defrag, and for
both nonextent and extent files.
This patch modified the writepage/write_begin credit caculation for
nonextent files, to use the new helper function. It also fixed the
problem that writepage on nonextent files did not consider the case
blocksize <pagesize, thus could possibelly need multiple block
allocation in a single transaction.
Signed-off-by: Mingming Cao <cmm@us.ibm.com>
Reviewed-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-08-20 04:16:07 +02:00
|
|
|
}
|
2008-11-06 22:49:36 +01:00
|
|
|
|
2006-10-11 10:20:50 +02:00
|
|
|
/*
|
ext4: journal credits calulation cleanup and fix for non-extent writepage
When considering how many journal credits are needed for modifying a
chunk of data, we need to account for the super block, inode block,
quota blocks and xattr block, indirect/index blocks, also, group bitmap
and group descriptor blocks for new allocation (including data and
indirect/index blocks). There are many places in ext4 do the calculation
on their own and often missed one or two meta blocks, and often they
assume single block allocation, and did not considering the multile
chunk of allocation case.
This patch is trying to cleanup current journal credit code, provides
some common helper funtion to calculate the journal credits, to be used
for writepage, writepages, DIO, fallocate, migration, defrag, and for
both nonextent and extent files.
This patch modified the writepage/write_begin credit caculation for
nonextent files, to use the new helper function. It also fixed the
problem that writepage on nonextent files did not consider the case
blocksize <pagesize, thus could possibelly need multiple block
allocation in a single transaction.
Signed-off-by: Mingming Cao <cmm@us.ibm.com>
Reviewed-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-08-20 04:16:07 +02:00
|
|
|
* Account for index blocks, block groups bitmaps and block group
|
|
|
|
* descriptor blocks if modify datablocks and index blocks
|
|
|
|
* worse case, the indexs blocks spread over different block groups
|
2006-10-11 10:20:50 +02:00
|
|
|
*
|
ext4: journal credits calulation cleanup and fix for non-extent writepage
When considering how many journal credits are needed for modifying a
chunk of data, we need to account for the super block, inode block,
quota blocks and xattr block, indirect/index blocks, also, group bitmap
and group descriptor blocks for new allocation (including data and
indirect/index blocks). There are many places in ext4 do the calculation
on their own and often missed one or two meta blocks, and often they
assume single block allocation, and did not considering the multile
chunk of allocation case.
This patch is trying to cleanup current journal credit code, provides
some common helper funtion to calculate the journal credits, to be used
for writepage, writepages, DIO, fallocate, migration, defrag, and for
both nonextent and extent files.
This patch modified the writepage/write_begin credit caculation for
nonextent files, to use the new helper function. It also fixed the
problem that writepage on nonextent files did not consider the case
blocksize <pagesize, thus could possibelly need multiple block
allocation in a single transaction.
Signed-off-by: Mingming Cao <cmm@us.ibm.com>
Reviewed-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-08-20 04:16:07 +02:00
|
|
|
* If datablocks are discontiguous, they are possible to spread over
|
tree-wide: fix assorted typos all over the place
That is "success", "unknown", "through", "performance", "[re|un]mapping"
, "access", "default", "reasonable", "[con]currently", "temperature"
, "channel", "[un]used", "application", "example","hierarchy", "therefore"
, "[over|under]flow", "contiguous", "threshold", "enough" and others.
Signed-off-by: André Goddard Rosa <andre.goddard@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
2009-11-14 16:09:05 +01:00
|
|
|
* different block groups too. If they are contiuguous, with flexbg,
|
ext4: journal credits calulation cleanup and fix for non-extent writepage
When considering how many journal credits are needed for modifying a
chunk of data, we need to account for the super block, inode block,
quota blocks and xattr block, indirect/index blocks, also, group bitmap
and group descriptor blocks for new allocation (including data and
indirect/index blocks). There are many places in ext4 do the calculation
on their own and often missed one or two meta blocks, and often they
assume single block allocation, and did not considering the multile
chunk of allocation case.
This patch is trying to cleanup current journal credit code, provides
some common helper funtion to calculate the journal credits, to be used
for writepage, writepages, DIO, fallocate, migration, defrag, and for
both nonextent and extent files.
This patch modified the writepage/write_begin credit caculation for
nonextent files, to use the new helper function. It also fixed the
problem that writepage on nonextent files did not consider the case
blocksize <pagesize, thus could possibelly need multiple block
allocation in a single transaction.
Signed-off-by: Mingming Cao <cmm@us.ibm.com>
Reviewed-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-08-20 04:16:07 +02:00
|
|
|
* they could still across block group boundary.
|
2006-10-11 10:20:50 +02:00
|
|
|
*
|
ext4: journal credits calulation cleanup and fix for non-extent writepage
When considering how many journal credits are needed for modifying a
chunk of data, we need to account for the super block, inode block,
quota blocks and xattr block, indirect/index blocks, also, group bitmap
and group descriptor blocks for new allocation (including data and
indirect/index blocks). There are many places in ext4 do the calculation
on their own and often missed one or two meta blocks, and often they
assume single block allocation, and did not considering the multile
chunk of allocation case.
This patch is trying to cleanup current journal credit code, provides
some common helper funtion to calculate the journal credits, to be used
for writepage, writepages, DIO, fallocate, migration, defrag, and for
both nonextent and extent files.
This patch modified the writepage/write_begin credit caculation for
nonextent files, to use the new helper function. It also fixed the
problem that writepage on nonextent files did not consider the case
blocksize <pagesize, thus could possibelly need multiple block
allocation in a single transaction.
Signed-off-by: Mingming Cao <cmm@us.ibm.com>
Reviewed-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-08-20 04:16:07 +02:00
|
|
|
* Also account for superblock, inode, quota and xattr blocks
|
|
|
|
*/
|
2010-10-28 03:30:14 +02:00
|
|
|
static int ext4_meta_trans_blocks(struct inode *inode, int nrblocks, int chunk)
|
ext4: journal credits calulation cleanup and fix for non-extent writepage
When considering how many journal credits are needed for modifying a
chunk of data, we need to account for the super block, inode block,
quota blocks and xattr block, indirect/index blocks, also, group bitmap
and group descriptor blocks for new allocation (including data and
indirect/index blocks). There are many places in ext4 do the calculation
on their own and often missed one or two meta blocks, and often they
assume single block allocation, and did not considering the multile
chunk of allocation case.
This patch is trying to cleanup current journal credit code, provides
some common helper funtion to calculate the journal credits, to be used
for writepage, writepages, DIO, fallocate, migration, defrag, and for
both nonextent and extent files.
This patch modified the writepage/write_begin credit caculation for
nonextent files, to use the new helper function. It also fixed the
problem that writepage on nonextent files did not consider the case
blocksize <pagesize, thus could possibelly need multiple block
allocation in a single transaction.
Signed-off-by: Mingming Cao <cmm@us.ibm.com>
Reviewed-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-08-20 04:16:07 +02:00
|
|
|
{
|
2009-05-01 14:50:38 +02:00
|
|
|
ext4_group_t groups, ngroups = ext4_get_groups_count(inode->i_sb);
|
|
|
|
int gdpblocks;
|
ext4: journal credits calulation cleanup and fix for non-extent writepage
When considering how many journal credits are needed for modifying a
chunk of data, we need to account for the super block, inode block,
quota blocks and xattr block, indirect/index blocks, also, group bitmap
and group descriptor blocks for new allocation (including data and
indirect/index blocks). There are many places in ext4 do the calculation
on their own and often missed one or two meta blocks, and often they
assume single block allocation, and did not considering the multile
chunk of allocation case.
This patch is trying to cleanup current journal credit code, provides
some common helper funtion to calculate the journal credits, to be used
for writepage, writepages, DIO, fallocate, migration, defrag, and for
both nonextent and extent files.
This patch modified the writepage/write_begin credit caculation for
nonextent files, to use the new helper function. It also fixed the
problem that writepage on nonextent files did not consider the case
blocksize <pagesize, thus could possibelly need multiple block
allocation in a single transaction.
Signed-off-by: Mingming Cao <cmm@us.ibm.com>
Reviewed-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-08-20 04:16:07 +02:00
|
|
|
int idxblocks;
|
|
|
|
int ret = 0;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* How many index blocks need to touch to modify nrblocks?
|
|
|
|
* The "Chunk" flag indicating whether the nrblocks is
|
|
|
|
* physically contiguous on disk
|
|
|
|
*
|
|
|
|
* For Direct IO and fallocate, they calls get_block to allocate
|
|
|
|
* one single extent at a time, so they could set the "Chunk" flag
|
|
|
|
*/
|
|
|
|
idxblocks = ext4_index_trans_blocks(inode, nrblocks, chunk);
|
|
|
|
|
|
|
|
ret = idxblocks;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Now let's see how many group bitmaps and group descriptors need
|
|
|
|
* to account
|
|
|
|
*/
|
|
|
|
groups = idxblocks;
|
|
|
|
if (chunk)
|
|
|
|
groups += 1;
|
|
|
|
else
|
|
|
|
groups += nrblocks;
|
|
|
|
|
|
|
|
gdpblocks = groups;
|
2009-05-01 14:50:38 +02:00
|
|
|
if (groups > ngroups)
|
|
|
|
groups = ngroups;
|
ext4: journal credits calulation cleanup and fix for non-extent writepage
When considering how many journal credits are needed for modifying a
chunk of data, we need to account for the super block, inode block,
quota blocks and xattr block, indirect/index blocks, also, group bitmap
and group descriptor blocks for new allocation (including data and
indirect/index blocks). There are many places in ext4 do the calculation
on their own and often missed one or two meta blocks, and often they
assume single block allocation, and did not considering the multile
chunk of allocation case.
This patch is trying to cleanup current journal credit code, provides
some common helper funtion to calculate the journal credits, to be used
for writepage, writepages, DIO, fallocate, migration, defrag, and for
both nonextent and extent files.
This patch modified the writepage/write_begin credit caculation for
nonextent files, to use the new helper function. It also fixed the
problem that writepage on nonextent files did not consider the case
blocksize <pagesize, thus could possibelly need multiple block
allocation in a single transaction.
Signed-off-by: Mingming Cao <cmm@us.ibm.com>
Reviewed-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-08-20 04:16:07 +02:00
|
|
|
if (groups > EXT4_SB(inode->i_sb)->s_gdb_count)
|
|
|
|
gdpblocks = EXT4_SB(inode->i_sb)->s_gdb_count;
|
|
|
|
|
|
|
|
/* bitmaps and block group descriptor blocks */
|
|
|
|
ret += groups + gdpblocks;
|
|
|
|
|
|
|
|
/* Blocks for super block, inode, quota and xattr blocks */
|
|
|
|
ret += EXT4_META_TRANS_BLOCKS(inode->i_sb);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
2011-03-31 03:57:33 +02:00
|
|
|
* Calculate the total number of credits to reserve to fit
|
2008-08-20 04:16:03 +02:00
|
|
|
* the modification of a single pages into a single transaction,
|
|
|
|
* which may include multiple chunks of block allocations.
|
2006-10-11 10:20:50 +02:00
|
|
|
*
|
2008-08-20 04:15:58 +02:00
|
|
|
* This could be called via ext4_write_begin()
|
2006-10-11 10:20:50 +02:00
|
|
|
*
|
2008-08-20 04:15:58 +02:00
|
|
|
* We need to consider the worse case, when
|
ext4: journal credits calulation cleanup and fix for non-extent writepage
When considering how many journal credits are needed for modifying a
chunk of data, we need to account for the super block, inode block,
quota blocks and xattr block, indirect/index blocks, also, group bitmap
and group descriptor blocks for new allocation (including data and
indirect/index blocks). There are many places in ext4 do the calculation
on their own and often missed one or two meta blocks, and often they
assume single block allocation, and did not considering the multile
chunk of allocation case.
This patch is trying to cleanup current journal credit code, provides
some common helper funtion to calculate the journal credits, to be used
for writepage, writepages, DIO, fallocate, migration, defrag, and for
both nonextent and extent files.
This patch modified the writepage/write_begin credit caculation for
nonextent files, to use the new helper function. It also fixed the
problem that writepage on nonextent files did not consider the case
blocksize <pagesize, thus could possibelly need multiple block
allocation in a single transaction.
Signed-off-by: Mingming Cao <cmm@us.ibm.com>
Reviewed-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-08-20 04:16:07 +02:00
|
|
|
* one new block per extent.
|
2006-10-11 10:20:50 +02:00
|
|
|
*/
|
2006-10-11 10:21:03 +02:00
|
|
|
int ext4_writepage_trans_blocks(struct inode *inode)
|
2006-10-11 10:20:50 +02:00
|
|
|
{
|
2006-10-11 10:20:53 +02:00
|
|
|
int bpp = ext4_journal_blocks_per_page(inode);
|
2006-10-11 10:20:50 +02:00
|
|
|
int ret;
|
|
|
|
|
ext4: journal credits calulation cleanup and fix for non-extent writepage
When considering how many journal credits are needed for modifying a
chunk of data, we need to account for the super block, inode block,
quota blocks and xattr block, indirect/index blocks, also, group bitmap
and group descriptor blocks for new allocation (including data and
indirect/index blocks). There are many places in ext4 do the calculation
on their own and often missed one or two meta blocks, and often they
assume single block allocation, and did not considering the multile
chunk of allocation case.
This patch is trying to cleanup current journal credit code, provides
some common helper funtion to calculate the journal credits, to be used
for writepage, writepages, DIO, fallocate, migration, defrag, and for
both nonextent and extent files.
This patch modified the writepage/write_begin credit caculation for
nonextent files, to use the new helper function. It also fixed the
problem that writepage on nonextent files did not consider the case
blocksize <pagesize, thus could possibelly need multiple block
allocation in a single transaction.
Signed-off-by: Mingming Cao <cmm@us.ibm.com>
Reviewed-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-08-20 04:16:07 +02:00
|
|
|
ret = ext4_meta_trans_blocks(inode, bpp, 0);
|
2006-10-11 10:21:03 +02:00
|
|
|
|
ext4: journal credits calulation cleanup and fix for non-extent writepage
When considering how many journal credits are needed for modifying a
chunk of data, we need to account for the super block, inode block,
quota blocks and xattr block, indirect/index blocks, also, group bitmap
and group descriptor blocks for new allocation (including data and
indirect/index blocks). There are many places in ext4 do the calculation
on their own and often missed one or two meta blocks, and often they
assume single block allocation, and did not considering the multile
chunk of allocation case.
This patch is trying to cleanup current journal credit code, provides
some common helper funtion to calculate the journal credits, to be used
for writepage, writepages, DIO, fallocate, migration, defrag, and for
both nonextent and extent files.
This patch modified the writepage/write_begin credit caculation for
nonextent files, to use the new helper function. It also fixed the
problem that writepage on nonextent files did not consider the case
blocksize <pagesize, thus could possibelly need multiple block
allocation in a single transaction.
Signed-off-by: Mingming Cao <cmm@us.ibm.com>
Reviewed-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-08-20 04:16:07 +02:00
|
|
|
/* Account for data blocks for journalled mode */
|
2006-10-11 10:20:53 +02:00
|
|
|
if (ext4_should_journal_data(inode))
|
ext4: journal credits calulation cleanup and fix for non-extent writepage
When considering how many journal credits are needed for modifying a
chunk of data, we need to account for the super block, inode block,
quota blocks and xattr block, indirect/index blocks, also, group bitmap
and group descriptor blocks for new allocation (including data and
indirect/index blocks). There are many places in ext4 do the calculation
on their own and often missed one or two meta blocks, and often they
assume single block allocation, and did not considering the multile
chunk of allocation case.
This patch is trying to cleanup current journal credit code, provides
some common helper funtion to calculate the journal credits, to be used
for writepage, writepages, DIO, fallocate, migration, defrag, and for
both nonextent and extent files.
This patch modified the writepage/write_begin credit caculation for
nonextent files, to use the new helper function. It also fixed the
problem that writepage on nonextent files did not consider the case
blocksize <pagesize, thus could possibelly need multiple block
allocation in a single transaction.
Signed-off-by: Mingming Cao <cmm@us.ibm.com>
Reviewed-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-08-20 04:16:07 +02:00
|
|
|
ret += bpp;
|
2006-10-11 10:20:50 +02:00
|
|
|
return ret;
|
|
|
|
}
|
2008-08-20 04:16:03 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Calculate the journal credits for a chunk of data modification.
|
|
|
|
*
|
|
|
|
* This is called from DIO, fallocate or whoever calling
|
2010-07-27 17:56:07 +02:00
|
|
|
* ext4_map_blocks() to map/allocate a chunk of contiguous disk blocks.
|
2008-08-20 04:16:03 +02:00
|
|
|
*
|
|
|
|
* journal buffers for data blocks are not included here, as DIO
|
|
|
|
* and fallocate do no need to journal data buffers.
|
|
|
|
*/
|
|
|
|
int ext4_chunk_trans_blocks(struct inode *inode, int nrblocks)
|
|
|
|
{
|
|
|
|
return ext4_meta_trans_blocks(inode, nrblocks, 1);
|
|
|
|
}
|
|
|
|
|
2006-10-11 10:20:50 +02:00
|
|
|
/*
|
2006-10-11 10:20:53 +02:00
|
|
|
* The caller must have previously called ext4_reserve_inode_write().
|
2006-10-11 10:20:50 +02:00
|
|
|
* Give this, we know that the caller already has write access to iloc->bh.
|
|
|
|
*/
|
2006-10-11 10:20:53 +02:00
|
|
|
int ext4_mark_iloc_dirty(handle_t *handle,
|
2009-06-14 23:45:34 +02:00
|
|
|
struct inode *inode, struct ext4_iloc *iloc)
|
2006-10-11 10:20:50 +02:00
|
|
|
{
|
|
|
|
int err = 0;
|
|
|
|
|
2008-01-29 05:58:27 +01:00
|
|
|
if (test_opt(inode->i_sb, I_VERSION))
|
|
|
|
inode_inc_iversion(inode);
|
|
|
|
|
2006-10-11 10:20:50 +02:00
|
|
|
/* the do_update_inode consumes one bh->b_count */
|
|
|
|
get_bh(iloc->bh);
|
|
|
|
|
2006-10-11 10:21:01 +02:00
|
|
|
/* ext4_do_update_inode() does jbd2_journal_dirty_metadata */
|
2009-09-29 16:07:47 +02:00
|
|
|
err = ext4_do_update_inode(handle, inode, iloc);
|
2006-10-11 10:20:50 +02:00
|
|
|
put_bh(iloc->bh);
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* On success, We end up with an outstanding reference count against
|
|
|
|
* iloc->bh. This _must_ be cleaned up later.
|
|
|
|
*/
|
|
|
|
|
|
|
|
int
|
2006-10-11 10:20:53 +02:00
|
|
|
ext4_reserve_inode_write(handle_t *handle, struct inode *inode,
|
|
|
|
struct ext4_iloc *iloc)
|
2006-10-11 10:20:50 +02:00
|
|
|
{
|
2009-01-07 06:06:22 +01:00
|
|
|
int err;
|
|
|
|
|
|
|
|
err = ext4_get_inode_loc(inode, iloc);
|
|
|
|
if (!err) {
|
|
|
|
BUFFER_TRACE(iloc->bh, "get_write_access");
|
|
|
|
err = ext4_journal_get_write_access(handle, iloc->bh);
|
|
|
|
if (err) {
|
|
|
|
brelse(iloc->bh);
|
|
|
|
iloc->bh = NULL;
|
2006-10-11 10:20:50 +02:00
|
|
|
}
|
|
|
|
}
|
2006-10-11 10:20:53 +02:00
|
|
|
ext4_std_error(inode->i_sb, err);
|
2006-10-11 10:20:50 +02:00
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2007-07-18 15:19:57 +02:00
|
|
|
/*
|
|
|
|
* Expand an inode by new_extra_isize bytes.
|
|
|
|
* Returns 0 on success or negative error number on failure.
|
|
|
|
*/
|
2008-01-29 05:58:27 +01:00
|
|
|
static int ext4_expand_extra_isize(struct inode *inode,
|
|
|
|
unsigned int new_extra_isize,
|
|
|
|
struct ext4_iloc iloc,
|
|
|
|
handle_t *handle)
|
2007-07-18 15:19:57 +02:00
|
|
|
{
|
|
|
|
struct ext4_inode *raw_inode;
|
|
|
|
struct ext4_xattr_ibody_header *header;
|
|
|
|
|
|
|
|
if (EXT4_I(inode)->i_extra_isize >= new_extra_isize)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
raw_inode = ext4_raw_inode(&iloc);
|
|
|
|
|
|
|
|
header = IHDR(inode, raw_inode);
|
|
|
|
|
|
|
|
/* No extended attributes present */
|
2010-01-24 20:34:07 +01:00
|
|
|
if (!ext4_test_inode_state(inode, EXT4_STATE_XATTR) ||
|
|
|
|
header->h_magic != cpu_to_le32(EXT4_XATTR_MAGIC)) {
|
2007-07-18 15:19:57 +02:00
|
|
|
memset((void *)raw_inode + EXT4_GOOD_OLD_INODE_SIZE, 0,
|
|
|
|
new_extra_isize);
|
|
|
|
EXT4_I(inode)->i_extra_isize = new_extra_isize;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* try to expand with EAs present */
|
|
|
|
return ext4_expand_extra_isize_ea(inode, new_extra_isize,
|
|
|
|
raw_inode, handle);
|
|
|
|
}
|
|
|
|
|
2006-10-11 10:20:50 +02:00
|
|
|
/*
|
|
|
|
* What we do here is to mark the in-core inode as clean with respect to inode
|
|
|
|
* dirtiness (it may still be data-dirty).
|
|
|
|
* This means that the in-core inode may be reaped by prune_icache
|
|
|
|
* without having to perform any I/O. This is a very good thing,
|
|
|
|
* because *any* task may call prune_icache - even ones which
|
|
|
|
* have a transaction open against a different journal.
|
|
|
|
*
|
|
|
|
* Is this cheating? Not really. Sure, we haven't written the
|
|
|
|
* inode out, but prune_icache isn't a user-visible syncing function.
|
|
|
|
* Whenever the user wants stuff synced (sys_sync, sys_msync, sys_fsync)
|
|
|
|
* we start and wait on commits.
|
|
|
|
*
|
|
|
|
* Is this efficient/effective? Well, we're being nice to the system
|
|
|
|
* by cleaning up our inodes proactively so they can be reaped
|
|
|
|
* without I/O. But we are potentially leaving up to five seconds'
|
|
|
|
* worth of inodes floating about which prune_icache wants us to
|
|
|
|
* write out. One way to fix that would be to get prune_icache()
|
|
|
|
* to do a write_super() to free up some memory. It has the desired
|
|
|
|
* effect.
|
|
|
|
*/
|
2006-10-11 10:20:53 +02:00
|
|
|
int ext4_mark_inode_dirty(handle_t *handle, struct inode *inode)
|
2006-10-11 10:20:50 +02:00
|
|
|
{
|
2006-10-11 10:20:53 +02:00
|
|
|
struct ext4_iloc iloc;
|
2007-07-18 15:19:57 +02:00
|
|
|
struct ext4_sb_info *sbi = EXT4_SB(inode->i_sb);
|
|
|
|
static unsigned int mnt_count;
|
|
|
|
int err, ret;
|
2006-10-11 10:20:50 +02:00
|
|
|
|
|
|
|
might_sleep();
|
2010-11-08 19:51:33 +01:00
|
|
|
trace_ext4_mark_inode_dirty(inode, _RET_IP_);
|
2006-10-11 10:20:53 +02:00
|
|
|
err = ext4_reserve_inode_write(handle, inode, &iloc);
|
2009-01-07 06:06:22 +01:00
|
|
|
if (ext4_handle_valid(handle) &&
|
|
|
|
EXT4_I(inode)->i_extra_isize < sbi->s_want_extra_isize &&
|
2010-01-24 20:34:07 +01:00
|
|
|
!ext4_test_inode_state(inode, EXT4_STATE_NO_EXPAND)) {
|
2007-07-18 15:19:57 +02:00
|
|
|
/*
|
|
|
|
* We need extra buffer credits since we may write into EA block
|
|
|
|
* with this same handle. If journal_extend fails, then it will
|
|
|
|
* only result in a minor loss of functionality for that inode.
|
|
|
|
* If this is felt to be critical, then e2fsck should be run to
|
|
|
|
* force a large enough s_min_extra_isize.
|
|
|
|
*/
|
|
|
|
if ((jbd2_journal_extend(handle,
|
|
|
|
EXT4_DATA_TRANS_BLOCKS(inode->i_sb))) == 0) {
|
|
|
|
ret = ext4_expand_extra_isize(inode,
|
|
|
|
sbi->s_want_extra_isize,
|
|
|
|
iloc, handle);
|
|
|
|
if (ret) {
|
2010-01-24 20:34:07 +01:00
|
|
|
ext4_set_inode_state(inode,
|
|
|
|
EXT4_STATE_NO_EXPAND);
|
2007-10-17 00:38:25 +02:00
|
|
|
if (mnt_count !=
|
|
|
|
le16_to_cpu(sbi->s_es->s_mnt_count)) {
|
2010-02-15 20:19:27 +01:00
|
|
|
ext4_warning(inode->i_sb,
|
2007-07-18 15:19:57 +02:00
|
|
|
"Unable to expand inode %lu. Delete"
|
|
|
|
" some EAs or run e2fsck.",
|
|
|
|
inode->i_ino);
|
2007-10-17 00:38:25 +02:00
|
|
|
mnt_count =
|
|
|
|
le16_to_cpu(sbi->s_es->s_mnt_count);
|
2007-07-18 15:19:57 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2006-10-11 10:20:50 +02:00
|
|
|
if (!err)
|
2006-10-11 10:20:53 +02:00
|
|
|
err = ext4_mark_iloc_dirty(handle, inode, &iloc);
|
2006-10-11 10:20:50 +02:00
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
2006-10-11 10:20:53 +02:00
|
|
|
* ext4_dirty_inode() is called from __mark_inode_dirty()
|
2006-10-11 10:20:50 +02:00
|
|
|
*
|
|
|
|
* We're really interested in the case where a file is being extended.
|
|
|
|
* i_size has been changed by generic_commit_write() and we thus need
|
|
|
|
* to include the updated inode in the current transaction.
|
|
|
|
*
|
2010-03-03 15:05:00 +01:00
|
|
|
* Also, dquot_alloc_block() will always dirty the inode when blocks
|
2006-10-11 10:20:50 +02:00
|
|
|
* are allocated to the file.
|
|
|
|
*
|
|
|
|
* If the inode is marked synchronous, we don't honour that here - doing
|
|
|
|
* so would cause a commit on atime updates, which we don't bother doing.
|
|
|
|
* We handle synchronous inodes at the highest possible level.
|
|
|
|
*/
|
2011-05-27 12:53:02 +02:00
|
|
|
void ext4_dirty_inode(struct inode *inode, int flags)
|
2006-10-11 10:20:50 +02:00
|
|
|
{
|
|
|
|
handle_t *handle;
|
|
|
|
|
2006-10-11 10:20:53 +02:00
|
|
|
handle = ext4_journal_start(inode, 2);
|
2006-10-11 10:20:50 +02:00
|
|
|
if (IS_ERR(handle))
|
|
|
|
goto out;
|
2009-09-29 22:06:01 +02:00
|
|
|
|
|
|
|
ext4_mark_inode_dirty(handle, inode);
|
|
|
|
|
2006-10-11 10:20:53 +02:00
|
|
|
ext4_journal_stop(handle);
|
2006-10-11 10:20:50 +02:00
|
|
|
out:
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
#if 0
|
|
|
|
/*
|
|
|
|
* Bind an inode's backing buffer_head into this transaction, to prevent
|
|
|
|
* it from being flushed to disk early. Unlike
|
2006-10-11 10:20:53 +02:00
|
|
|
* ext4_reserve_inode_write, this leaves behind no bh reference and
|
2006-10-11 10:20:50 +02:00
|
|
|
* returns no iloc structure, so the caller needs to repeat the iloc
|
|
|
|
* lookup to mark the inode dirty later.
|
|
|
|
*/
|
2006-10-11 10:20:53 +02:00
|
|
|
static int ext4_pin_inode(handle_t *handle, struct inode *inode)
|
2006-10-11 10:20:50 +02:00
|
|
|
{
|
2006-10-11 10:20:53 +02:00
|
|
|
struct ext4_iloc iloc;
|
2006-10-11 10:20:50 +02:00
|
|
|
|
|
|
|
int err = 0;
|
|
|
|
if (handle) {
|
2006-10-11 10:20:53 +02:00
|
|
|
err = ext4_get_inode_loc(inode, &iloc);
|
2006-10-11 10:20:50 +02:00
|
|
|
if (!err) {
|
|
|
|
BUFFER_TRACE(iloc.bh, "get_write_access");
|
2006-10-11 10:21:01 +02:00
|
|
|
err = jbd2_journal_get_write_access(handle, iloc.bh);
|
2006-10-11 10:20:50 +02:00
|
|
|
if (!err)
|
2009-01-07 06:06:22 +01:00
|
|
|
err = ext4_handle_dirty_metadata(handle,
|
2010-02-16 21:06:29 +01:00
|
|
|
NULL,
|
2009-01-07 06:06:22 +01:00
|
|
|
iloc.bh);
|
2006-10-11 10:20:50 +02:00
|
|
|
brelse(iloc.bh);
|
|
|
|
}
|
|
|
|
}
|
2006-10-11 10:20:53 +02:00
|
|
|
ext4_std_error(inode->i_sb, err);
|
2006-10-11 10:20:50 +02:00
|
|
|
return err;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2006-10-11 10:20:53 +02:00
|
|
|
int ext4_change_inode_journal_flag(struct inode *inode, int val)
|
2006-10-11 10:20:50 +02:00
|
|
|
{
|
|
|
|
journal_t *journal;
|
|
|
|
handle_t *handle;
|
|
|
|
int err;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* We have to be very careful here: changing a data block's
|
|
|
|
* journaling status dynamically is dangerous. If we write a
|
|
|
|
* data block to the journal, change the status and then delete
|
|
|
|
* that block, we risk forgetting to revoke the old log record
|
|
|
|
* from the journal and so a subsequent replay can corrupt data.
|
|
|
|
* So, first we make sure that the journal is empty and that
|
|
|
|
* nobody is changing anything.
|
|
|
|
*/
|
|
|
|
|
2006-10-11 10:20:53 +02:00
|
|
|
journal = EXT4_JOURNAL(inode);
|
2009-01-07 06:06:22 +01:00
|
|
|
if (!journal)
|
|
|
|
return 0;
|
2007-07-18 14:33:51 +02:00
|
|
|
if (is_journal_aborted(journal))
|
2006-10-11 10:20:50 +02:00
|
|
|
return -EROFS;
|
|
|
|
|
2006-10-11 10:21:01 +02:00
|
|
|
jbd2_journal_lock_updates(journal);
|
|
|
|
jbd2_journal_flush(journal);
|
2006-10-11 10:20:50 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
* OK, there are no updates running now, and all cached data is
|
|
|
|
* synced to disk. We are now in a completely consistent state
|
|
|
|
* which doesn't have anything in the journal, and we know that
|
|
|
|
* no filesystem updates are running, so it is safe to modify
|
|
|
|
* the inode's in-core data-journaling state flag now.
|
|
|
|
*/
|
|
|
|
|
|
|
|
if (val)
|
2010-05-17 04:00:00 +02:00
|
|
|
ext4_set_inode_flag(inode, EXT4_INODE_JOURNAL_DATA);
|
2006-10-11 10:20:50 +02:00
|
|
|
else
|
2010-05-17 04:00:00 +02:00
|
|
|
ext4_clear_inode_flag(inode, EXT4_INODE_JOURNAL_DATA);
|
2006-10-11 10:20:53 +02:00
|
|
|
ext4_set_aops(inode);
|
2006-10-11 10:20:50 +02:00
|
|
|
|
2006-10-11 10:21:01 +02:00
|
|
|
jbd2_journal_unlock_updates(journal);
|
2006-10-11 10:20:50 +02:00
|
|
|
|
|
|
|
/* Finally we can mark the inode as dirty. */
|
|
|
|
|
2006-10-11 10:20:53 +02:00
|
|
|
handle = ext4_journal_start(inode, 1);
|
2006-10-11 10:20:50 +02:00
|
|
|
if (IS_ERR(handle))
|
|
|
|
return PTR_ERR(handle);
|
|
|
|
|
2006-10-11 10:20:53 +02:00
|
|
|
err = ext4_mark_inode_dirty(handle, inode);
|
2009-01-07 06:06:22 +01:00
|
|
|
ext4_handle_sync(handle);
|
2006-10-11 10:20:53 +02:00
|
|
|
ext4_journal_stop(handle);
|
|
|
|
ext4_std_error(inode->i_sb, err);
|
2006-10-11 10:20:50 +02:00
|
|
|
|
|
|
|
return err;
|
|
|
|
}
|
2008-07-12 01:27:31 +02:00
|
|
|
|
|
|
|
static int ext4_bh_unmapped(handle_t *handle, struct buffer_head *bh)
|
|
|
|
{
|
|
|
|
return !buffer_mapped(bh);
|
|
|
|
}
|
|
|
|
|
2009-04-01 00:23:21 +02:00
|
|
|
int ext4_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)
|
2008-07-12 01:27:31 +02:00
|
|
|
{
|
2009-04-01 00:23:21 +02:00
|
|
|
struct page *page = vmf->page;
|
2008-07-12 01:27:31 +02:00
|
|
|
loff_t size;
|
|
|
|
unsigned long len;
|
2011-06-24 20:29:41 +02:00
|
|
|
int ret;
|
2008-07-12 01:27:31 +02:00
|
|
|
struct file *file = vma->vm_file;
|
|
|
|
struct inode *inode = file->f_path.dentry->d_inode;
|
|
|
|
struct address_space *mapping = inode->i_mapping;
|
2011-06-24 20:29:41 +02:00
|
|
|
handle_t *handle;
|
|
|
|
get_block_t *get_block;
|
|
|
|
int retries = 0;
|
2008-07-12 01:27:31 +02:00
|
|
|
|
|
|
|
/*
|
2011-06-24 20:29:41 +02:00
|
|
|
* This check is racy but catches the common case. We rely on
|
|
|
|
* __block_page_mkwrite() to do a reliable check.
|
2008-07-12 01:27:31 +02:00
|
|
|
*/
|
2011-06-24 20:29:41 +02:00
|
|
|
vfs_check_frozen(inode->i_sb, SB_FREEZE_WRITE);
|
|
|
|
/* Delalloc case is easy... */
|
|
|
|
if (test_opt(inode->i_sb, DELALLOC) &&
|
|
|
|
!ext4_should_journal_data(inode) &&
|
|
|
|
!ext4_nonda_switch(inode->i_sb)) {
|
|
|
|
do {
|
|
|
|
ret = __block_page_mkwrite(vma, vmf,
|
|
|
|
ext4_da_get_block_prep);
|
|
|
|
} while (ret == -ENOSPC &&
|
|
|
|
ext4_should_retry_alloc(inode->i_sb, &retries));
|
|
|
|
goto out_ret;
|
2008-07-12 01:27:31 +02:00
|
|
|
}
|
2011-05-18 19:55:20 +02:00
|
|
|
|
|
|
|
lock_page(page);
|
2011-06-24 20:29:41 +02:00
|
|
|
size = i_size_read(inode);
|
|
|
|
/* Page got truncated from under us? */
|
|
|
|
if (page->mapping != mapping || page_offset(page) > size) {
|
|
|
|
unlock_page(page);
|
|
|
|
ret = VM_FAULT_NOPAGE;
|
|
|
|
goto out;
|
2011-05-18 19:55:20 +02:00
|
|
|
}
|
2008-07-12 01:27:31 +02:00
|
|
|
|
|
|
|
if (page->index == size >> PAGE_CACHE_SHIFT)
|
|
|
|
len = size & ~PAGE_CACHE_MASK;
|
|
|
|
else
|
|
|
|
len = PAGE_CACHE_SIZE;
|
2009-09-10 04:36:03 +02:00
|
|
|
/*
|
2011-06-24 20:29:41 +02:00
|
|
|
* Return if we have all the buffers mapped. This avoids the need to do
|
|
|
|
* journal_start/journal_stop which can block and take a long time
|
2009-09-10 04:36:03 +02:00
|
|
|
*/
|
2008-07-12 01:27:31 +02:00
|
|
|
if (page_has_buffers(page)) {
|
|
|
|
if (!walk_page_buffers(NULL, page_buffers(page), 0, len, NULL,
|
2009-09-10 04:36:03 +02:00
|
|
|
ext4_bh_unmapped)) {
|
2011-06-24 20:29:41 +02:00
|
|
|
/* Wait so that we don't change page under IO */
|
|
|
|
wait_on_page_writeback(page);
|
|
|
|
ret = VM_FAULT_LOCKED;
|
|
|
|
goto out;
|
2009-09-10 04:36:03 +02:00
|
|
|
}
|
2008-07-12 01:27:31 +02:00
|
|
|
}
|
2009-09-10 04:36:03 +02:00
|
|
|
unlock_page(page);
|
2011-06-24 20:29:41 +02:00
|
|
|
/* OK, we need to fill the hole... */
|
|
|
|
if (ext4_should_dioread_nolock(inode))
|
|
|
|
get_block = ext4_get_block_write;
|
|
|
|
else
|
|
|
|
get_block = ext4_get_block;
|
|
|
|
retry_alloc:
|
|
|
|
handle = ext4_journal_start(inode, ext4_writepage_trans_blocks(inode));
|
|
|
|
if (IS_ERR(handle)) {
|
2009-04-01 00:23:21 +02:00
|
|
|
ret = VM_FAULT_SIGBUS;
|
2011-06-24 20:29:41 +02:00
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
ret = __block_page_mkwrite(vma, vmf, get_block);
|
|
|
|
if (!ret && ext4_should_journal_data(inode)) {
|
|
|
|
if (walk_page_buffers(handle, page_buffers(page), 0,
|
|
|
|
PAGE_CACHE_SIZE, NULL, do_journal_get_write_access)) {
|
|
|
|
unlock_page(page);
|
|
|
|
ret = VM_FAULT_SIGBUS;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
ext4_set_inode_state(inode, EXT4_STATE_JDATA);
|
|
|
|
}
|
|
|
|
ext4_journal_stop(handle);
|
|
|
|
if (ret == -ENOSPC && ext4_should_retry_alloc(inode->i_sb, &retries))
|
|
|
|
goto retry_alloc;
|
|
|
|
out_ret:
|
|
|
|
ret = block_page_mkwrite_return(ret);
|
|
|
|
out:
|
2008-07-12 01:27:31 +02:00
|
|
|
return ret;
|
|
|
|
}
|