projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
btrfs: unlock extents in btrfs_zero_range in case of quota reservation errors
[linux-2.6-microblaze.git]
/
fs
/
ext4
/
page-io.c
diff --git
a/fs/ext4/page-io.c
b/fs/ext4/page-io.c
index
defd2e1
..
03a44a0
100644
(file)
--- a/
fs/ext4/page-io.c
+++ b/
fs/ext4/page-io.c
@@
-111,9
+111,6
@@
static void ext4_finish_bio(struct bio *bio)
unsigned under_io = 0;
unsigned long flags;
unsigned under_io = 0;
unsigned long flags;
- if (!page)
- continue;
-
if (fscrypt_is_bounce_page(page)) {
bounce_page = page;
page = fscrypt_pagecache_page(bounce_page);
if (fscrypt_is_bounce_page(page)) {
bounce_page = page;
page = fscrypt_pagecache_page(bounce_page);
@@
-438,7
+435,6
@@
submit_and_retry:
int ext4_bio_write_page(struct ext4_io_submit *io,
struct page *page,
int len,
int ext4_bio_write_page(struct ext4_io_submit *io,
struct page *page,
int len,
- struct writeback_control *wbc,
bool keep_towrite)
{
struct page *bounce_page = NULL;
bool keep_towrite)
{
struct page *bounce_page = NULL;
@@
-448,6
+444,7
@@
int ext4_bio_write_page(struct ext4_io_submit *io,
int ret = 0;
int nr_submitted = 0;
int nr_to_submit = 0;
int ret = 0;
int nr_submitted = 0;
int nr_to_submit = 0;
+ struct writeback_control *wbc = io->io_wbc;
BUG_ON(!PageLocked(page));
BUG_ON(PageWriteback(page));
BUG_ON(!PageLocked(page));
BUG_ON(PageWriteback(page));