On Wed 08-07-09 08:53:27, Nick Piggin wrote: > On Tue, Jul 07, 2009 at 12:38:29PM -0400, Christoph Hellwig wrote: > > > @@ -68,7 +70,7 @@ void ext2_delete_inode (struct inode * i > > > > > > inode->i_size = 0; > > > if (inode->i_blocks) > > > - ext2_truncate (inode); > > > + ext2_truncate_blocks(inode, 0); > > > ext2_free_inode (inode); > > > > > > return; > > > > > -void ext2_truncate(struct inode *inode) > > > +static void ext2_truncate_blocks(struct inode *inode, loff_t offset) > > > { > > > __le32 *i_data = EXT2_I(inode)->i_data; > > > struct ext2_inode_info *ei = EXT2_I(inode); > > > @@ -1032,27 +1074,8 @@ void ext2_truncate(struct inode *inode) > > > int n; > > > long iblock; > > > unsigned blocksize; > > > - > > > - if (!(S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode) || > > > - S_ISLNK(inode->i_mode))) > > > - return; > > > - if (ext2_inode_is_fast_symlink(inode)) > > > - return; > > > - if (IS_APPEND(inode) || IS_IMMUTABLE(inode)) > > > - return; > > > - > > > > We can't move this to the caller easily. ext2_delete_inode gets > > called for all inodes, but we only want to go on truncating for the > > limited set that passes this check. > > Hmm, shouldn't they have no ->i_blocks in that case? Not necessarily. Inode can have extended attributes set and those can be stored in a special block which is accounted in i_blocks. Honza -- Jan Kara <jack@xxxxxxx> SUSE Labs, CR -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html