From: Jan Kara <jack@suse•cz>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: linux-next@vger•kernel.org, Theodore Tso <tytso@MIT•EDU>,
"Aneesh Kumar K.V" <aneesh.kumar@linux•vnet.ibm.com>,
Mingming Cao <cmm@us•ibm.com>
Subject: Re: linux-next: manual merge of the ext4 tree with the tree
Date: Tue, 3 Mar 2009 20:09:36 +0100 [thread overview]
Message-ID: <20090303190936.GB432@duck.suse.cz> (raw)
In-Reply-To: <20090227130340.ad238eb8.sfr@canb.auug.org.au>
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
next prev parent reply other threads:[~2009-03-03 19:09 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-27 2:03 linux-next: manual merge of the ext4 tree with the tree Stephen Rothwell
2009-03-03 19:09 ` Jan Kara [this message]
-- strict thread matches above, loose matches on Subject: below --
2009-02-25 1:52 Stephen Rothwell
2009-02-25 9:43 ` Jan Kara
2009-02-26 6:03 ` Theodore Tso
2009-02-26 8:36 ` Stephen Rothwell
2009-02-26 14:08 ` Theodore Tso
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090303190936.GB432@duck.suse.cz \
--to=jack@suse$(echo .)cz \
--cc=aneesh.kumar@linux$(echo .)vnet.ibm.com \
--cc=cmm@us$(echo .)ibm.com \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=tytso@MIT$(echo .)EDU \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox