Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 359039
b: refs/heads/master
c: fe089c7
h: refs/heads/master
i:
  359037: 0259643
  359035: 70c07f2
  359031: caebd7d
  359023: 0955745
  359007: 7c6044d
  358975: 4a16621
  358911: 2072241
v: v3
  • Loading branch information
Jan Kara authored and Theodore Ts'o committed Jan 28, 2013
1 parent 91d12c8 commit b53b21b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 12 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 1ae48a6354a364413d372df1525d523a3fb4fb8c
refs/heads/master: fe089c77f1466c74f0f19ad2475b1630216b8b19
13 changes: 2 additions & 11 deletions trunk/fs/ext4/inode.c
Original file line number Diff line number Diff line change
Expand Up @@ -1354,7 +1354,6 @@ static int mpage_da_submit_io(struct mpage_da_data *mpd,
loff_t size = i_size_read(inode);
unsigned int len, block_start;
struct buffer_head *bh, *page_bufs = NULL;
int journal_data = ext4_should_journal_data(inode);
sector_t pblock = 0, cur_logical = 0;
struct ext4_io_submit io_submit;

Expand Down Expand Up @@ -1453,16 +1452,8 @@ static int mpage_da_submit_io(struct mpage_da_data *mpd,
block_commit_write(page, 0, len);

clear_page_dirty_for_io(page);
/*
* Delalloc doesn't support data journalling,
* but eventually maybe we'll lift this
* restriction.
*/
if (unlikely(journal_data && PageChecked(page)))
err = __ext4_journalled_writepage(page, len);
else
err = ext4_bio_write_page(&io_submit, page,
len, mpd->wbc);
err = ext4_bio_write_page(&io_submit, page, len,
mpd->wbc);
if (!err)
mpd->pages_written++;
/*
Expand Down

0 comments on commit b53b21b

Please sign in to comment.