From mboxrd@z Thu Jan 1 00:00:00 1970 From: npiggin@suse.de Subject: [patch 30/41] reiserfs use generic_cont_expand_simple Date: Fri, 25 May 2007 22:22:14 +1000 Message-ID: <20070524053157.840099000@linux.local0.net> References: <20070524052844.860329000@suse.de> Cc: linux-fsdevel@vger.kernel.org, Mark Fasheh , Vladimir Saveliev To: Andrew Morton Return-path: Received: from cantor.suse.de ([195.135.220.2]:40146 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754617AbXEYMhV (ORCPT ); Fri, 25 May 2007 08:37:21 -0400 Content-Disposition: inline; filename=fs-reiserfs-use-generic_cont_expand_simple.patch Sender: linux-fsdevel-owner@vger.kernel.org List-Id: linux-fsdevel.vger.kernel.org From: Vladimir Saveliev This patch makes reiserfs to use AOP_FLAG_CONT_EXPAND in order to get rid of the special generic_cont_expand routine Signed-off-by: Vladimir Saveliev Signed-off-by: Nick Piggin --- --- fs/reiserfs/inode.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) Index: linux-2.6/fs/reiserfs/inode.c =================================================================== --- linux-2.6.orig/fs/reiserfs/inode.c +++ linux-2.6/fs/reiserfs/inode.c @@ -2562,13 +2562,20 @@ static int reiserfs_write_begin(struct f int ret; int old_ref = 0; + inode = mapping->host; + *fsdata = 0; + if (flags & AOP_FLAG_CONT_EXPAND && + (pos & (inode->i_sb->s_blocksize - 1)) == 0) { + pos ++; + *fsdata = (void *)(unsigned long)flags; + } + index = pos >> PAGE_CACHE_SHIFT; page = __grab_cache_page(mapping, index); if (!page) return -ENOMEM; *pagep = page; - inode = mapping->host; reiserfs_wait_on_write_block(inode->i_sb); fix_tail_page_for_writing(page); if (reiserfs_transaction_running(inode->i_sb)) { @@ -2678,6 +2685,8 @@ static int reiserfs_write_end(struct fil struct reiserfs_transaction_handle *th; unsigned start; + if ((unsigned long)fsdata & AOP_FLAG_CONT_EXPAND) + pos ++; reiserfs_wait_on_write_block(inode->i_sb); if (reiserfs_transaction_running(inode->i_sb)) @@ -3066,7 +3075,7 @@ int reiserfs_setattr(struct dentry *dent } /* fill in hole pointers in the expanding truncate case. */ if (attr->ia_size > inode->i_size) { - error = generic_cont_expand(inode, attr->ia_size); + error = generic_cont_expand_simple(inode, attr->ia_size); if (REISERFS_I(inode)->i_prealloc_count > 0) { int err; struct reiserfs_transaction_handle th; --