linux-next: manual merge of the ext4 tree with the tree

linux-next: manual merge of the ext4 tree with the tree

[Stephen Rothwell]

Hi Ted,

Today's linux-next merge of the ext4 tree got a conflict in
fs/ext4/ext4.h between commit 7c989bb2f1b18268968ce44c603f18a9854b1b85
("ext4: quota reservation for delayed allocation") from the quota tree
and commit eafffefbb8cc3db4acebb75014091b473c60007d ("ext4: add
EXT4_IOC_ALLOC_DA_BLKS ioctl") from the ext4 tree.

Just overlapping additions. I fixed it up (see below) and can carry the
fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc fs/ext4/ext4.h
index 6083bb3,09626d3..0000000
--- a/fs/ext4/ext4.h
+++ b/fs/ext4/ext4.h
@@@ -1099,7 -1097,7 +1098,8 @@@ extern int ext4_chunk_trans_blocks(stru
  extern int ext4_block_truncate_page(handle_t *handle,
  		struct address_space *mapping, loff_t from);
  extern int ext4_page_mkwrite(struct vm_area_struct *vma, struct page *page);
 +extern qsize_t ext4_get_reserved_space(struct inode *inode);
+ extern int ext4_alloc_da_blocks(struct inode *inode);
  
  /* ioctl.c */
  extern long ext4_ioctl(struct file *, unsigned int, unsigned long);

Re: linux-next: manual merge of the ext4 tree with the tree

[Jan Kara]

On Wed 25-02-09 12:52:54, Stephen Rothwell wrote:
> Today's linux-next merge of the ext4 tree got a conflict in
> fs/ext4/ext4.h between commit 7c989bb2f1b18268968ce44c603f18a9854b1b85
> ("ext4: quota reservation for delayed allocation") from the quota tree
> and commit eafffefbb8cc3db4acebb75014091b473c60007d ("ext4: add
> EXT4_IOC_ALLOC_DA_BLKS ioctl") from the ext4 tree.
> 
> Just overlapping additions. I fixed it up (see below) and can carry the
> fix as necessary.
  Thanks.

									Honza
-- 
Jan Kara <jack@suse.cz>
SUSE Labs, CR

Re: linux-next: manual merge of the ext4 tree with the tree

[Theodore Tso]

On Wed, Feb 25, 2009 at 12:52:54PM +1100, Stephen Rothwell wrote:
> Hi Ted,
> 
> Today's linux-next merge of the ext4 tree got a conflict in
> fs/ext4/ext4.h between commit 7c989bb2f1b18268968ce44c603f18a9854b1b85
> ("ext4: quota reservation for delayed allocation") from the quota tree
> and commit eafffefbb8cc3db4acebb75014091b473c60007d ("ext4: add
> EXT4_IOC_ALLOC_DA_BLKS ioctl") from the ext4 tree.
> 
> Just overlapping additions. I fixed it up (see below) and can carry the
> fix as necessary.

Thanks, I've moved up the function declaration to avoid the need for a
manual fixup.

						- Ted

Re: linux-next: manual merge of the ext4 tree with the tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 297 bytes --]

Hi Ted,

On Thu, 26 Feb 2009 01:03:45 -0500 Theodore Tso <tytso@mit.edu> wrote:
>
> Thanks, I've moved up the function declaration to avoid the need for a
> manual fixup.

Thanks.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: manual merge of the ext4 tree with the tree

[Theodore Tso]

On Thu, Feb 26, 2009 at 07:36:49PM +1100, Stephen Rothwell wrote:
> Hi Ted,
> 
> On Thu, 26 Feb 2009 01:03:45 -0500 Theodore Tso <tytso@mit.edu> wrote:
> >
> > Thanks, I've moved up the function declaration to avoid the need for a
> > manual fixup.
> 
> Thanks.

np!  Saves work for you, and it saves work for Linus.  :-)

     	   	    	     	- Ted

linux-next: manual merge of the ext4 tree with the tree

[Stephen Rothwell]

Hi Ted,

Today's linux-next merge of the ext4 tree got a conflict in
fs/ext4/inode.c between commit ext4_da_update_reserve_space ("ext4: quota
reservation for delayed allocation") from the quota tree and commit
ext4_da_update_reserve_space ("ext4: Fix discard of inode prealloc space
with delayed allocation") from the ext4 tree.

I think this is just overlapping additions.  I fixed it up by taking both
changes (see below) but it is worth a look.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

diff --cc fs/ext4/inode.c
index a2845b5,8815b9c..0000000
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@@ -1050,11 -1054,13 +1065,19 @@@ static void ext4_da_update_reserve_spac
  	spin_unlock(&EXT4_I(inode)->i_block_reservation_lock);
  
  	/*
 +	 * free those over-booking quota for metadata blocks
 +	 */
 +
 +	if (mdb_free)
 +		vfs_dq_release_reservation_block(inode, mdb_free);
++
++	/*
+ 	 * If have done all the pending block allocation and if the we
+ 	 * don't have any writer on the inode, we can discard the
+ 	 * inode's preallocations.
+ 	 */
+ 	if (!total && (atomic_read(&inode->i_writecount) == 0))
+ 		ext4_discard_preallocations(inode);
  }
  
  /*

Re: linux-next: manual merge of the ext4 tree with the tree

[Jan Kara]

  Hi,

On Fri 27-02-09 13:03:40, Stephen Rothwell wrote:
> Today's linux-next merge of the ext4 tree got a conflict in
> fs/ext4/inode.c between commit ext4_da_update_reserve_space ("ext4: quota
> reservation for delayed allocation") from the quota tree and commit
> ext4_da_update_reserve_space ("ext4: Fix discard of inode prealloc space
> with delayed allocation") from the ext4 tree.
> 
> I think this is just overlapping additions.  I fixed it up by taking both
> changes (see below) but it is worth a look.
  Yes, they're just overlapping additions. Thanks for fixing this up.

									Honza

> diff --cc fs/ext4/inode.c
> index a2845b5,8815b9c..0000000
> --- a/fs/ext4/inode.c
> +++ b/fs/ext4/inode.c
> @@@ -1050,11 -1054,13 +1065,19 @@@ static void ext4_da_update_reserve_spac
>   	spin_unlock(&EXT4_I(inode)->i_block_reservation_lock);
>   
>   	/*
>  +	 * free those over-booking quota for metadata blocks
>  +	 */
>  +
>  +	if (mdb_free)
>  +		vfs_dq_release_reservation_block(inode, mdb_free);
> ++
> ++	/*
> + 	 * If have done all the pending block allocation and if the we
> + 	 * don't have any writer on the inode, we can discard the
> + 	 * inode's preallocations.
> + 	 */
> + 	if (!total && (atomic_read(&inode->i_writecount) == 0))
> + 		ext4_discard_preallocations(inode);
>   }
>   
>   /*
-- 
Jan Kara <jack@suse.cz>
SUSE Labs, CR