git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nilfs2: fix lock order reversal in chcp operation
[safe/jmp/linux-2.6]
/
fs
/
buffer.c
diff --git
a/fs/buffer.c
b/fs/buffer.c
index
209f7f1
..
6fa5302
100644
(file)
--- a/
fs/buffer.c
+++ b/
fs/buffer.c
@@
-280,7
+280,7
@@
void invalidate_bdev(struct block_device *bdev)
EXPORT_SYMBOL(invalidate_bdev);
/*
EXPORT_SYMBOL(invalidate_bdev);
/*
- * Kick
pdflush
then try to free up some ZONE_NORMAL memory.
+ * Kick
the writeback threads
then try to free up some ZONE_NORMAL memory.
*/
static void free_more_memory(void)
{
*/
static void free_more_memory(void)
{
@@
-1709,9
+1709,9
@@
static int __block_write_full_page(struct inode *inode, struct page *page,
/*
* If it's a fully non-blocking write attempt and we cannot
* lock the buffer then redirty the page. Note that this can
/*
* If it's a fully non-blocking write attempt and we cannot
* lock the buffer then redirty the page. Note that this can
- * potentially cause a busy-wait loop from
pdflush and kswapd
- * a
ctivity, but those code paths have their own higher-level
- * throttling.
+ * potentially cause a busy-wait loop from
writeback threads
+ * a
nd kswapd activity, but those code paths have their own
+ *
higher-level
throttling.
*/
if (wbc->sync_mode != WB_SYNC_NONE || !wbc->nonblocking) {
lock_buffer(bh);
*/
if (wbc->sync_mode != WB_SYNC_NONE || !wbc->nonblocking) {
lock_buffer(bh);
@@
-2239,16
+2239,10
@@
int generic_cont_expand_simple(struct inode *inode, loff_t size)
struct address_space *mapping = inode->i_mapping;
struct page *page;
void *fsdata;
struct address_space *mapping = inode->i_mapping;
struct page *page;
void *fsdata;
- unsigned long limit;
int err;
int err;
- err = -EFBIG;
- limit = current->signal->rlim[RLIMIT_FSIZE].rlim_cur;
- if (limit != RLIM_INFINITY && size > (loff_t)limit) {
- send_sig(SIGXFSZ, current, 0);
- goto out;
- }
- if (size > inode->i_sb->s_maxbytes)
+ err = inode_newsize_ok(inode, size);
+ if (err)
goto out;
err = pagecache_write_begin(NULL, mapping, size, 0,
goto out;
err = pagecache_write_begin(NULL, mapping, size, 0,
@@
-3214,7
+3208,7
@@
EXPORT_SYMBOL(block_sync_page);
* still running obsolete flush daemons, so we terminate them here.
*
* Use of bdflush() is deprecated and will be removed in a future kernel.
* still running obsolete flush daemons, so we terminate them here.
*
* Use of bdflush() is deprecated and will be removed in a future kernel.
- * The `
pdflush
' kernel threads fully replace bdflush daemons and this call.
+ * The `
flush-X
' kernel threads fully replace bdflush daemons and this call.
*/
SYSCALL_DEFINE2(bdflush, int, func, long, data)
{
*/
SYSCALL_DEFINE2(bdflush, int, func, long, data)
{