From 344d774cb007d6012908474ec0d6d86a5f8383cf Mon Sep 17 00:00:00 2001 From: Christoph Lameter Date: Thu, 26 Jul 2007 11:32:08 -0700 Subject: [PATCH] Missing stuff --- fs/buffer.c | 2 +- fs/reiserfs/xattr.c | 6 +++--- fs/xfs/linux-2.6/xfs_lrw.c | 2 +- include/linux/pagemap.h | 7 ++++++- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/fs/buffer.c b/fs/buffer.c index 39b52c7..375bb6d 100644 --- a/fs/buffer.c +++ b/fs/buffer.c @@ -1811,7 +1811,7 @@ static int __block_prepare_write(struct inode *inode, struct page *page, if (block_end > to || block_start < from) zero_user_segments(page, to, block_end, - block_start, from) + block_start, from); continue; } } diff --git a/fs/reiserfs/xattr.c b/fs/reiserfs/xattr.c index 14bf601..5ca01f3 100644 --- a/fs/reiserfs/xattr.c +++ b/fs/reiserfs/xattr.c @@ -598,13 +598,13 @@ reiserfs_xattr_get(const struct inode *inode, const char *name, void *buffer, size_t chunk; char *data; size_t skip = 0; - if (isize - file_pos > page_cache_size(xinode->mapping)) - chunk = page_cache_size(xinode->mapping); + if (isize - file_pos > page_cache_size(xinode->i_mapping)) + chunk = page_cache_size(xinode->i_mapping); else chunk = isize - file_pos; page = reiserfs_get_page(xinode, - page_index(xinode->mapping, file_pos)); + page_cache_index(xinode->i_mapping, file_pos)); if (IS_ERR(page)) { err = PTR_ERR(page); goto out_dput; diff --git a/fs/xfs/linux-2.6/xfs_lrw.c b/fs/xfs/linux-2.6/xfs_lrw.c index 6edf0be..d1f3130 100644 --- a/fs/xfs/linux-2.6/xfs_lrw.c +++ b/fs/xfs/linux-2.6/xfs_lrw.c @@ -159,7 +159,7 @@ xfs_iozero( if (status) goto unlock; - zero_user_page(page, offset, bytes, KM_USER0); + zero_user(page, offset, bytes); status = mapping->a_ops->commit_write(NULL, page, offset, offset + bytes); diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index 0978e77..a9f6748 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h @@ -60,7 +60,12 @@ static inline void mapping_setup(struct address_space *m, */ m->flags &= ~__GFP_HIGHMEM; m->flags |= __GFP_COMP; - raise_kswapd_order(order); + /* + * If we could raise the kswapd order then it should be + * done here. + * + * raise_kswapd_order(order); + */ } #endif } -- 1.4.4.4