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
ceph: fix open file counting on snapped inodes when mds returns no caps
[safe/jmp/linux-2.6]
/
fs
/
buffer.c
diff --git
a/fs/buffer.c
b/fs/buffer.c
index
209f7f1
..
c9c266d
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,
@@
-2899,7
+2893,7
@@
int block_write_full_page_endio(struct page *page, get_block_t *get_block,
/*
* The page straddles i_size. It must be zeroed out on each and every
/*
* The page straddles i_size. It must be zeroed out on each and every
- * writepage invo
k
ation because it may be mmapped. "A file is mapped
+ * writepage invo
c
ation because it may be mmapped. "A file is mapped
* in multiples of the page size. For a file that is not a multiple of
* the page size, the remaining memory is zeroed when mapped, and
* writes to that region are not written out to the file."
* in multiples of the page size. For a file that is not a multiple of
* the page size, the remaining memory is zeroed when mapped, and
* writes to that region are not written out to the file."
@@
-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)
{
@@
-3271,7
+3265,7
@@
static void recalc_bh_state(void)
struct buffer_head *alloc_buffer_head(gfp_t gfp_flags)
{
struct buffer_head *alloc_buffer_head(gfp_t gfp_flags)
{
- struct buffer_head *ret = kmem_cache_alloc(bh_cachep, gfp_flags);
+ struct buffer_head *ret = kmem_cache_
z
alloc(bh_cachep, gfp_flags);
if (ret) {
INIT_LIST_HEAD(&ret->b_assoc_buffers);
get_cpu_var(bh_accounting).nr++;
if (ret) {
INIT_LIST_HEAD(&ret->b_assoc_buffers);
get_cpu_var(bh_accounting).nr++;
@@
-3358,15
+3352,6
@@
int bh_submit_read(struct buffer_head *bh)
}
EXPORT_SYMBOL(bh_submit_read);
}
EXPORT_SYMBOL(bh_submit_read);
-static void
-init_buffer_head(void *data)
-{
- struct buffer_head *bh = data;
-
- memset(bh, 0, sizeof(*bh));
- INIT_LIST_HEAD(&bh->b_assoc_buffers);
-}
-
void __init buffer_init(void)
{
int nrpages;
void __init buffer_init(void)
{
int nrpages;
@@
-3375,7
+3360,7
@@
void __init buffer_init(void)
sizeof(struct buffer_head), 0,
(SLAB_RECLAIM_ACCOUNT|SLAB_PANIC|
SLAB_MEM_SPREAD),
sizeof(struct buffer_head), 0,
(SLAB_RECLAIM_ACCOUNT|SLAB_PANIC|
SLAB_MEM_SPREAD),
-
init_buffer_head
);
+
NULL
);
/*
* Limit the bh occupancy to 10% of ZONE_NORMAL
/*
* Limit the bh occupancy to 10% of ZONE_NORMAL