projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[firefly-linux-kernel-4.4.55.git]
/
fs
/
buffer.c
diff --git
a/fs/buffer.c
b/fs/buffer.c
index 776ae091d3b0d58052aacb899e0954c3b191ae10..c26da785938ac1e75cf30944c952a31f15f14814 100644
(file)
--- a/
fs/buffer.c
+++ b/
fs/buffer.c
@@
-1996,7
+1996,7
@@
int block_write_begin(struct file *file, struct address_space *mapping,
page = *pagep;
if (page == NULL) {
ownpage = 1;
page = *pagep;
if (page == NULL) {
ownpage = 1;
- page =
__grab_cache_page(mapping, index
);
+ page =
grab_cache_page_write_begin(mapping, index, flags
);
if (!page) {
status = -ENOMEM;
goto out;
if (!page) {
status = -ENOMEM;
goto out;
@@
-2022,7
+2022,6
@@
int block_write_begin(struct file *file, struct address_space *mapping,
if (pos + len > inode->i_size)
vmtruncate(inode, inode->i_size);
}
if (pos + len > inode->i_size)
vmtruncate(inode, inode->i_size);
}
- goto out;
}
out:
}
out:
@@
-2502,7
+2501,7
@@
int nobh_write_begin(struct file *file, struct address_space *mapping,
from = pos & (PAGE_CACHE_SIZE - 1);
to = from + len;
from = pos & (PAGE_CACHE_SIZE - 1);
to = from + len;
- page =
__grab_cache_page(mapping, index
);
+ page =
grab_cache_page_write_begin(mapping, index, flags
);
if (!page)
return -ENOMEM;
*pagep = page;
if (!page)
return -ENOMEM;
*pagep = page;