From mboxrd@z Thu Jan 1 00:00:00 1970 From: npiggin@suse.de Subject: [patch 4/5] tmpfs: convert to use the new truncate convention Date: Fri, 10 Jul 2009 17:30:32 +1000 Message-ID: <20090710073231.048395467@suse.de> References: <20090710073028.782561541@suse.de> Cc: hch@infradead.org, viro@zeniv.linux.org.uk, jack@suse.cz, hugh.dickins@tiscali.co.uk To: linux-fsdevel@vger.kernel.org Return-path: Received: from cantor.suse.de ([195.135.220.2]:47430 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751044AbZGJHeX (ORCPT ); Fri, 10 Jul 2009 03:34:23 -0400 Content-Disposition: inline; filename=tmpfs-new-truncate.patch Sender: linux-fsdevel-owner@vger.kernel.org List-ID: Cc: hugh.dickins@tiscali.co.uk Signed-off-by: Nick Piggin --- fs/ext2/ext2.h | 1 fs/ext2/file.c | 2 fs/ext2/inode.c | 137 +++++++++++++++++++++++++++++++++++++++++++++----------- mm/shmem.c | 35 +++++++------- 4 files changed, 131 insertions(+), 44 deletions(-) Index: linux-2.6/mm/shmem.c =================================================================== --- linux-2.6.orig/mm/shmem.c +++ linux-2.6/mm/shmem.c @@ -730,10 +730,11 @@ done2: if (inode->i_mapping->nrpages && (info->flags & SHMEM_PAGEIN)) { /* * Call truncate_inode_pages again: racing shmem_unuse_inode - * may have swizzled a page in from swap since vmtruncate or - * generic_delete_inode did it, before we lowered next_index. - * Also, though shmem_getpage checks i_size before adding to - * cache, no recheck after: so fix the narrow window there too. + * may have swizzled a page in from swap since + * truncate_pagecache or generic_delete_inode did it, before we + * lowered next_index. Also, though shmem_getpage checks + * i_size before adding to cache, no recheck after: so fix the + * narrow window there too. * * Recalling truncate_inode_pages_range and unmap_mapping_range * every time for punch_hole (which never got a chance to clear @@ -763,11 +764,6 @@ done2: } } -static void shmem_truncate(struct inode *inode) -{ - shmem_truncate_range(inode, inode->i_size, (loff_t)-1); -} - static int shmem_notify_change(struct dentry *dentry, struct iattr *attr) { struct inode *inode = dentry->d_inode; @@ -775,6 +771,8 @@ static int shmem_notify_change(struct de int error; if (S_ISREG(inode->i_mode) && (attr->ia_valid & ATTR_SIZE)) { + loff_t newsize = attr->ia_size; + if (attr->ia_size < inode->i_size) { /* * If truncating down to a partial page, then @@ -783,9 +781,9 @@ static int shmem_notify_change(struct de * truncate_partial_page cannnot miss it were * it assigned to swap. */ - if (attr->ia_size & (PAGE_CACHE_SIZE-1)) { + if (newsize & (PAGE_CACHE_SIZE-1)) { (void) shmem_getpage(inode, - attr->ia_size>>PAGE_CACHE_SHIFT, + newsize >> PAGE_CACHE_SHIFT, &page, SGP_READ, NULL); if (page) unlock_page(page); @@ -797,13 +795,19 @@ static int shmem_notify_change(struct de * if it's being fully truncated to zero-length: the * nrpages check is efficient enough in that case. */ - if (attr->ia_size) { + if (newsize) { struct shmem_inode_info *info = SHMEM_I(inode); spin_lock(&info->lock); info->flags &= ~SHMEM_PAGEIN; spin_unlock(&info->lock); } } + + error = simple_setsize(inode, newsize); + if (error) + return error; + shmem_truncate_range(inode, newsize, (loff_t)-1); + attr->ia_valid &= ~ATTR_SIZE; } error = inode_change_ok(inode, attr); @@ -822,11 +826,11 @@ static void shmem_delete_inode(struct in { struct shmem_inode_info *info = SHMEM_I(inode); - if (inode->i_op->truncate == shmem_truncate) { + if (inode->i_mapping->a_ops == &shmem_aops) { truncate_inode_pages(inode->i_mapping, 0); shmem_unacct_size(info->flags, inode->i_size); inode->i_size = 0; - shmem_truncate(inode); + shmem_truncate_range(inode, 0, (loff_t)-1); if (!list_empty(&info->swaplist)) { mutex_lock(&shmem_swaplist_mutex); list_del_init(&info->swaplist); @@ -2018,7 +2022,6 @@ static const struct inode_operations shm }; static const struct inode_operations shmem_symlink_inode_operations = { - .truncate = shmem_truncate, .readlink = generic_readlink, .follow_link = shmem_follow_link, .put_link = shmem_put_link, @@ -2438,7 +2441,7 @@ static const struct file_operations shme }; static const struct inode_operations shmem_inode_operations = { - .truncate = shmem_truncate, + .new_truncate = 1, .setattr = shmem_notify_change, .truncate_range = shmem_truncate_range, #ifdef CONFIG_TMPFS_POSIX_ACL