From 4c7594d1df3e4adee8bfe1362709ce00e0fc475d Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Thu, 15 Nov 2012 23:08:57 -0500 Subject: [PATCH] --- yaml --- r: 344865 b: refs/heads/master c: f3b59291a69d0b734be1fc8be489fef2dd846d3d h: refs/heads/master i: 344863: 0a9a2250b6d46080c190f19ea4cc9b8d6f032500 v: v3 --- [refs] | 2 +- trunk/fs/ext4/inode.c | 20 +------------------- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/[refs] b/[refs] index 77264747ddb7..756e10de830e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 66bea92c69477a75a5d37b9bfed5773c92a3c4b4 +refs/heads/master: f3b59291a69d0b734be1fc8be489fef2dd846d3d diff --git a/trunk/fs/ext4/inode.c b/trunk/fs/ext4/inode.c index 52f7ff2f2e7e..cf5d30a7cce3 100644 --- a/trunk/fs/ext4/inode.c +++ b/trunk/fs/ext4/inode.c @@ -1636,15 +1636,6 @@ static void mpage_da_map_and_submit(struct mpage_da_data *mpd) for (i = 0; i < map.m_len; i++) unmap_underlying_metadata(bdev, map.m_pblk + i); - - if (ext4_should_order_data(mpd->inode)) { - err = ext4_jbd2_file_inode(handle, mpd->inode); - if (err) { - /* Only if the journal is aborted */ - mpd->retval = err; - goto submit_io; - } - } } /* @@ -2592,17 +2583,8 @@ static int ext4_da_write_end(struct file *file, if (copied && 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); - + if (new_i_size > EXT4_I(inode)->i_disksize) EXT4_I(inode)->i_disksize = new_i_size; - } up_write(&EXT4_I(inode)->i_data_sem); /* We need to mark inode dirty even if * new_i_size is less that inode->i_size