From: Amir Goldstein <amir73il@gmail.com>
Subject: Re: [Ext4 punch hole 1/6 v5] Ext4 Punch Hole Support: Add flag to ext4_has_free_blocks
Date: Mon, 25 Apr 2011 10:51:37 +0300
Message-ID: <BANLkTi=1PEcextZ03RXXHixzHtav1m2tfQ@mail.gmail.com>
References: <4DAD3C98.3050308@linux.vnet.ibm.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: QUOTED-PRINTABLE
Cc: linux-ext4@vger.kernel.org, Yongqiang Yang <xiaoqiangnk@gmail.com>,
	Mingming Cao <cmm@us.ibm.com>, Theodore Tso <tytso@mit.edu>
To: Allison Henderson <achender@linux.vnet.ibm.com>
Return-path: <linux-ext4-owner@vger.kernel.org>
Received: from mail-ew0-f46.google.com ([209.85.215.46]:63590 "EHLO
	mail-ew0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1756650Ab1DYHvl convert rfc822-to-8bit (ORCPT
	<rfc822;linux-ext4@vger.kernel.org>); Mon, 25 Apr 2011 03:51:41 -0400
Received: by ewy4 with SMTP id 4so639302ewy.19
        for <linux-ext4@vger.kernel.org>; Mon, 25 Apr 2011 00:51:39 -0700 (PDT)
In-Reply-To: <4DAD3C98.3050308@linux.vnet.ibm.com>
Sender: linux-ext4-owner@vger.kernel.org
List-ID: <linux-ext4.vger.kernel.org>

Hi Allison,

Sorry for the late response.
I find it hard to digest yet another set of flags,
especially, since there is already an impressive set of
flags for allocation hints, which is what USE_ROOTBLKS flag really is.

So I think it would be much better to pass the flag in ext4_allocation_=
request
and add the 'ar' argument to functions that don't have it, rather than =
adding
a 'flags' argument.

If you do create a patch to pass 'ar' down to has_free_blocks()
I will also be able to use it to pass the HINT_COWING flag.

Now here is another advise:
In ext4_mb_new_blocks() after ext4_claim_free_blocks(), there is a call=
 to
dquot_alloc_block().
You need to call dquot_alloc_block_nofail() when allocating for punch h=
ole,
otherwise punch hole can fail on quota limits.
We already have a patch for doing that with HINT_COWING flag.

I think maybe it is best if our groups (punch hole and snapshots) have
a mutual 'next'
repository we can work with to prepare for the 2.6.40 merge window.
It would be even better, if Ted also collaborated his big alloc patches=
=2E

What do you think guys?

Amir.

On Tue, Apr 19, 2011 at 10:41 AM, Allison Henderson
<achender@linux.vnet.ibm.com> wrote:
> This patch adds a flag to ext4_has_free_blocks which
> enables the use of reserved blocks. =A0This will allow
> a punch hole to proceed even if the disk is full.
> Punching a hole may require additional blocks to first
> split the extents. =A0The blocks will be reclaimed after
> the punch hole completes.
>
> Because ext4_has_free_blocks is a low level function,
> the flag needs to be passed down through several
> functions listed below:
>
> ext4_ext_insert_extent
> ext4_ext_create_new_leaf
> ext4_ext_grow_indepth
> ext4_ext_split
> ext4_ext_new_meta_block
> ext4_mb_new_blocks
> ext4_claim_free_blocks
> ext4_has_free_blocks
>
> Signed-off-by: Allison Henderson <achender@us.ibm.com>
> ---
> :100644 100644 97b970e... 794c4d2... M =A0fs/ext4/balloc.c
> :100644 100644 4daaf2b... 6c1f415... M =A0fs/ext4/ext4.h
> :100644 100644 dd2cb50... 0b186d9... M =A0fs/ext4/extents.c
> :100644 100644 1a86282... ec890fd... M =A0fs/ext4/inode.c
> :100644 100644 a5837a8... db8b120... M =A0fs/ext4/mballoc.c
> :100644 100644 b545ca1... 2d9b12c... M =A0fs/ext4/xattr.c
> =A0fs/ext4/balloc.c =A0| =A0 17 ++++++++++-------
> =A0fs/ext4/ext4.h =A0 =A0| =A0 16 +++++++++++++---
> =A0fs/ext4/extents.c | =A0 27 ++++++++++++++++-----------
> =A0fs/ext4/inode.c =A0 | =A0 =A06 +++---
> =A0fs/ext4/mballoc.c | =A0 =A05 +++--
> =A0fs/ext4/xattr.c =A0 | =A0 =A02 +-
> =A06 files changed, 46 insertions(+), 27 deletions(-)
>
> diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c
> index 97b970e..794c4d2 100644
> --- a/fs/ext4/balloc.c
> +++ b/fs/ext4/balloc.c
> @@ -493,7 +493,8 @@ error_return:
> =A0* Check if filesystem has nblocks free & available for allocation.
> =A0* On success return 1, return 0 on failure.
> =A0*/
> -static int ext4_has_free_blocks(struct ext4_sb_info *sbi, s64 nblock=
s)
> +static int ext4_has_free_blocks(struct ext4_sb_info *sbi,
> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 s64 nbl=
ocks, int flags)
> =A0{
> =A0 =A0 =A0 =A0s64 free_blocks, dirty_blocks, root_blocks;
> =A0 =A0 =A0 =A0struct percpu_counter *fbc =3D &sbi->s_freeblocks_coun=
ter;
> @@ -522,7 +523,9 @@ static int ext4_has_free_blocks(struct ext4_sb_in=
fo *sbi, s64 nblocks)
> =A0 =A0 =A0 =A0/* Hm, nope. =A0Are (enough) root reserved blocks avai=
lable? */
> =A0 =A0 =A0 =A0if (sbi->s_resuid =3D=3D current_fsuid() ||
> =A0 =A0 =A0 =A0 =A0 =A0((sbi->s_resgid !=3D 0) && in_group_p(sbi->s_r=
esgid)) ||
> - =A0 =A0 =A0 =A0 =A0 capable(CAP_SYS_RESOURCE)) {
> + =A0 =A0 =A0 =A0 =A0 capable(CAP_SYS_RESOURCE) ||
> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 (flags & EXT4_HAS_FREE_BLKS_USE_ROOTBLK=
S)) {
> +
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0if (free_blocks >=3D (nblocks + dirty_=
blocks))
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0return 1;
> =A0 =A0 =A0 =A0}
> @@ -531,9 +534,9 @@ static int ext4_has_free_blocks(struct ext4_sb_in=
fo *sbi, s64 nblocks)
> =A0}
>
> =A0int ext4_claim_free_blocks(struct ext4_sb_info *sbi,
> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0=
 =A0 =A0 =A0 =A0 =A0 =A0 s64 nblocks)
> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0=
 =A0 =A0 =A0 =A0 =A0 =A0 s64 nblocks, int flags)
> =A0{
> - =A0 =A0 =A0 if (ext4_has_free_blocks(sbi, nblocks)) {
> + =A0 =A0 =A0 if (ext4_has_free_blocks(sbi, nblocks, flags)) {
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0percpu_counter_add(&sbi->s_dirtyblocks=
_counter, nblocks);
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0return 0;
> =A0 =A0 =A0 =A0} else
> @@ -554,7 +557,7 @@ int ext4_claim_free_blocks(struct ext4_sb_info *s=
bi,
> =A0*/
> =A0int ext4_should_retry_alloc(struct super_block *sb, int *retries)
> =A0{
> - =A0 =A0 =A0 if (!ext4_has_free_blocks(EXT4_SB(sb), 1) ||
> + =A0 =A0 =A0 if (!ext4_has_free_blocks(EXT4_SB(sb), 1, 0) ||
> =A0 =A0 =A0 =A0 =A0 =A0(*retries)++ > 3 ||
> =A0 =A0 =A0 =A0 =A0 =A0!EXT4_SB(sb)->s_journal)
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0return 0;
> @@ -577,7 +580,7 @@ int ext4_should_retry_alloc(struct super_block *s=
b, int *retries)
> =A0* error stores in errp pointer
> =A0*/
> =A0ext4_fsblk_t ext4_new_meta_blocks(handle_t *handle, struct inode *=
inode,
> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 ext4_fsblk_t goal, unsigned long *count=
, int *errp)
> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 ext4_fsblk_t goal, unsigned long *count=
, int *errp, int flags)
> =A0{
> =A0 =A0 =A0 =A0struct ext4_allocation_request ar;
> =A0 =A0 =A0 =A0ext4_fsblk_t ret;
> @@ -588,7 +591,7 @@ ext4_fsblk_t ext4_new_meta_blocks(handle_t *handl=
e, struct inode *inode,
> =A0 =A0 =A0 =A0ar.goal =3D goal;
> =A0 =A0 =A0 =A0ar.len =3D count ? *count : 1;
>
> - =A0 =A0 =A0 ret =3D ext4_mb_new_blocks(handle, &ar, errp);
> + =A0 =A0 =A0 ret =3D ext4_mb_new_blocks(handle, &ar, errp, flags);
> =A0 =A0 =A0 =A0if (count)
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0*count =3D ar.len;
> =A0 =A0 =A0 =A0/*
> diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
> index 4daaf2b..6c1f415 100644
> --- a/fs/ext4/ext4.h
> +++ b/fs/ext4/ext4.h
> @@ -512,6 +512,8 @@ struct ext4_new_group_data {
> =A0 =A0 =A0 =A0/* Convert extent to initialized after IO complete */
> =A0#define EXT4_GET_BLOCKS_IO_CONVERT_EXT =A0 =A0 =A0 =A0 (EXT4_GET_B=
LOCKS_CONVERT|\
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0=
 =A0 =A0 EXT4_GET_BLOCKS_CREATE_UNINIT_EXT)
> + =A0 =A0 =A0 /* Punch out blocks of an extent */
> +#define EXT4_GET_BLOCKS_PUNCH_OUT_EXT =A0 =A0 =A0 =A0 =A00x0020
>
> =A0/*
> =A0* Flags used by ext4_free_blocks
> @@ -521,6 +523,11 @@ struct ext4_new_group_data {
> =A0#define EXT4_FREE_BLOCKS_VALIDATED =A0 =A0 0x0004
>
> =A0/*
> + * Flags used by ext4_has_free_blocks
> + */
> +#define EXT4_HAS_FREE_BLKS_USE_ROOTBLKS 0x0001
> +
> +/*
> =A0* ioctl commands
> =A0*/
> =A0#define =A0 =A0 =A0 =A0EXT4_IOC_GETFLAGS =A0 =A0 =A0 =A0 =A0 =A0 =A0=
 FS_IOC_GETFLAGS
> @@ -1638,8 +1645,10 @@ extern int ext4_bg_has_super(struct super_bloc=
k *sb, ext4_group_t group);
> =A0extern unsigned long ext4_bg_num_gdb(struct super_block *sb,
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0ext4_group_t group);
> =A0extern ext4_fsblk_t ext4_new_meta_blocks(handle_t *handle, struct =
inode *inode,
> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 ext4_fsblk_t goal, unsi=
gned long *count, int *errp);
> -extern int ext4_claim_free_blocks(struct ext4_sb_info *sbi, s64 nblo=
cks);
> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 ext4_fsblk_t goal, unsi=
gned long *count,
> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 int *errp, int flags);
> +extern int ext4_claim_free_blocks(struct ext4_sb_info *sbi,
> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0=
 =A0 =A0 s64 nblocks, int flags);
> =A0extern void ext4_add_groupblocks(handle_t *handle, struct super_bl=
ock *sb,
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0ext4_f=
sblk_t block, unsigned long count);
> =A0extern ext4_fsblk_t ext4_count_free_blocks(struct super_block *);
> @@ -1696,7 +1705,8 @@ extern long ext4_mb_max_to_scan;
> =A0extern int ext4_mb_init(struct super_block *, int);
> =A0extern int ext4_mb_release(struct super_block *);
> =A0extern ext4_fsblk_t ext4_mb_new_blocks(handle_t *,
> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 struct =
ext4_allocation_request *, int *);
> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 struct =
ext4_allocation_request *,
> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 int *, =
int flags);
> =A0extern int ext4_mb_reserve_blocks(struct super_block *, int);
> =A0extern void ext4_discard_preallocations(struct inode *);
> =A0extern int __init ext4_init_mballoc(void);
> diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
> index dd2cb50..0b186d9 100644
> --- a/fs/ext4/extents.c
> +++ b/fs/ext4/extents.c
> @@ -192,12 +192,12 @@ static ext4_fsblk_t ext4_ext_find_goal(struct i=
node *inode,
> =A0static ext4_fsblk_t
> =A0ext4_ext_new_meta_block(handle_t *handle, struct inode *inode,
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0struct ext4_ext_path *=
path,
> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 struct ext4_extent *ex,=
 int *err)
> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 struct ext4_extent *ex,=
 int *err, int flags)
> =A0{
> =A0 =A0 =A0 =A0ext4_fsblk_t goal, newblock;
>
> =A0 =A0 =A0 =A0goal =3D ext4_ext_find_goal(inode, path, le32_to_cpu(e=
x->ee_block));
> - =A0 =A0 =A0 newblock =3D ext4_new_meta_blocks(handle, inode, goal, =
NULL, err);
> + =A0 =A0 =A0 newblock =3D ext4_new_meta_blocks(handle, inode, goal, =
NULL, err, flags);
> =A0 =A0 =A0 =A0return newblock;
> =A0}
>
> @@ -793,7 +793,7 @@ static int ext4_ext_insert_index(handle_t *handle=
, struct inode *inode,
> =A0*/
> =A0static int ext4_ext_split(handle_t *handle, struct inode *inode,
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0struct=
 ext4_ext_path *path,
> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 struct =
ext4_extent *newext, int at)
> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 struct =
ext4_extent *newext, int at, int flags)
> =A0{
> =A0 =A0 =A0 =A0struct buffer_head *bh =3D NULL;
> =A0 =A0 =A0 =A0int depth =3D ext_depth(inode);
> @@ -847,7 +847,7 @@ static int ext4_ext_split(handle_t *handle, struc=
t inode *inode,
> =A0 =A0 =A0 =A0ext_debug("allocate %d blocks for indexes/leaf\n", dep=
th - at);
> =A0 =A0 =A0 =A0for (a =3D 0; a < depth - at; a++) {
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0newblock =3D ext4_ext_new_meta_block(h=
andle, inode, path,
> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0=
 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0newext, &err);
> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0=
 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0newext, &err, flags);
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0if (newblock =3D=3D 0)
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0goto cleanup;
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0ablocks[a] =3D newblock;
> @@ -1057,7 +1057,7 @@ cleanup:
> =A0*/
> =A0static int ext4_ext_grow_indepth(handle_t *handle, struct inode *i=
node,
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0=
 =A0 =A0struct ext4_ext_path *path,
> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0=
 =A0 =A0 struct ext4_extent *newext)
> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0=
 =A0 =A0 struct ext4_extent *newext, int flags)
> =A0{
> =A0 =A0 =A0 =A0struct ext4_ext_path *curp =3D path;
> =A0 =A0 =A0 =A0struct ext4_extent_header *neh;
> @@ -1065,7 +1065,8 @@ static int ext4_ext_grow_indepth(handle_t *hand=
le, struct inode *inode,
> =A0 =A0 =A0 =A0ext4_fsblk_t newblock;
> =A0 =A0 =A0 =A0int err =3D 0;
>
> - =A0 =A0 =A0 newblock =3D ext4_ext_new_meta_block(handle, inode, pat=
h, newext, &err);
> + =A0 =A0 =A0 newblock =3D ext4_ext_new_meta_block(handle, inode, pat=
h,
> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 newext, &err, flags);
> =A0 =A0 =A0 =A0if (newblock =3D=3D 0)
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0return err;
>
> @@ -1141,7 +1142,7 @@ out:
> =A0*/
> =A0static int ext4_ext_create_new_leaf(handle_t *handle, struct inode=
 *inode,
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0=
 =A0 =A0struct ext4_ext_path *path,
> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0=
 =A0 =A0 struct ext4_extent *newext)
> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0=
 =A0 =A0 struct ext4_extent *newext, int flags)
> =A0{
> =A0 =A0 =A0 =A0struct ext4_ext_path *curp;
> =A0 =A0 =A0 =A0int depth, i, err =3D 0;
> @@ -1161,7 +1162,7 @@ repeat:
> =A0 =A0 =A0 =A0if (EXT_HAS_FREE_INDEX(curp)) {
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0/* if we found index with free entry, =
then use that
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 * entry: create all needed subtree an=
d add new leaf */
> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 err =3D ext4_ext_split(handle, inode, p=
ath, newext, i);
> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 err =3D ext4_ext_split(handle, inode, p=
ath, newext, i, flags);
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0if (err)
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0goto out;
>
> @@ -1174,7 +1175,7 @@ repeat:
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0err =3D PTR_ERR(path);
> =A0 =A0 =A0 =A0} else {
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0/* tree is full, time to grow in depth=
 */
> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 err =3D ext4_ext_grow_indepth(handle, i=
node, path, newext);
> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 err =3D ext4_ext_grow_indepth(handle, i=
node, path, newext, flags);
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0if (err)
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0goto out;
>
> @@ -1668,6 +1669,7 @@ int ext4_ext_insert_extent(handle_t *handle, st=
ruct inode *inode,
> =A0 =A0 =A0 =A0int depth, len, err;
> =A0 =A0 =A0 =A0ext4_lblk_t next;
> =A0 =A0 =A0 =A0unsigned uninitialized =3D 0;
> + =A0 =A0 =A0 int free_blks_flags =3D 0;
>
> =A0 =A0 =A0 =A0if (unlikely(ext4_ext_get_actual_len(newext) =3D=3D 0)=
) {
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0EXT4_ERROR_INODE(inode, "ext4_ext_get_=
actual_len(newext) =3D=3D 0");
> @@ -1742,7 +1744,10 @@ repeat:
> =A0 =A0 =A0 =A0 * There is no free space in the found leaf.
> =A0 =A0 =A0 =A0 * We're gonna add a new leaf in the tree.
> =A0 =A0 =A0 =A0 */
> - =A0 =A0 =A0 err =3D ext4_ext_create_new_leaf(handle, inode, path, n=
ewext);
> + =A0 =A0 =A0 if (flag & EXT4_GET_BLOCKS_PUNCH_OUT_EXT)
> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 free_blks_flags =3D EXT4_HAS_FREE_BLKS_=
USE_ROOTBLKS;
> + =A0 =A0 =A0 err =3D ext4_ext_create_new_leaf(handle, inode, path,
> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 newext, free_blks_flags);
> =A0 =A0 =A0 =A0if (err)
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0goto cleanup;
> =A0 =A0 =A0 =A0depth =3D ext_depth(inode);
> @@ -3446,7 +3451,7 @@ int ext4_ext_map_blocks(handle_t *handle, struc=
t inode *inode,
> =A0 =A0 =A0 =A0else
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0/* disable in-core preallocation for n=
on-regular files */
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0ar.flags =3D 0;
> - =A0 =A0 =A0 newblock =3D ext4_mb_new_blocks(handle, &ar, &err);
> + =A0 =A0 =A0 newblock =3D ext4_mb_new_blocks(handle, &ar, &err, 0);
> =A0 =A0 =A0 =A0if (!newblock)
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0goto out2;
> =A0 =A0 =A0 =A0ext_debug("allocate new block: goal %llu, found %llu/%=
u\n",
> diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
> index 1a86282..ec890fd 100644
> --- a/fs/ext4/inode.c
> +++ b/fs/ext4/inode.c
> @@ -640,7 +640,7 @@ static int ext4_alloc_blocks(handle_t *handle, st=
ruct inode *inode,
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0count =3D target;
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0/* allocating blocks for indirect bloc=
ks and direct blocks */
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0current_block =3D ext4_new_meta_blocks=
(handle, inode,
> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0=
 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 goal, &count, err);
> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0=
 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 goal, &count, err, 0);
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0if (*err)
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0goto failed_out;
>
> @@ -686,7 +686,7 @@ static int ext4_alloc_blocks(handle_t *handle, st=
ruct inode *inode,
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0/* enable in-core preallocation only f=
or regular files */
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0ar.flags =3D EXT4_MB_HINT_DATA;
>
> - =A0 =A0 =A0 current_block =3D ext4_mb_new_blocks(handle, &ar, err);
> + =A0 =A0 =A0 current_block =3D ext4_mb_new_blocks(handle, &ar, err, =
0);
> =A0 =A0 =A0 =A0if (unlikely(current_block + ar.len > EXT4_MAX_BLOCK_F=
ILE_PHYS)) {
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0EXT4_ERROR_INODE(inode,
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 "curr=
ent_block %llu + ar.len %d > %d!",
> @@ -1930,7 +1930,7 @@ repeat:
> =A0 =A0 =A0 =A0 * We do still charge estimated metadata to the sb tho=
ugh;
> =A0 =A0 =A0 =A0 * we cannot afford to run out of free blocks.
> =A0 =A0 =A0 =A0 */
> - =A0 =A0 =A0 if (ext4_claim_free_blocks(sbi, md_needed + 1)) {
> + =A0 =A0 =A0 if (ext4_claim_free_blocks(sbi, md_needed + 1, 0)) {
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0dquot_release_reservation_block(inode,=
 1);
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0if (ext4_should_retry_alloc(inode->i_s=
b, &retries)) {
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0yield();
> diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
> index a5837a8..db8b120 100644
> --- a/fs/ext4/mballoc.c
> +++ b/fs/ext4/mballoc.c
> @@ -4276,7 +4276,8 @@ static int ext4_mb_discard_preallocations(struc=
t super_block *sb, int needed)
> =A0* to usual allocation
> =A0*/
> =A0ext4_fsblk_t ext4_mb_new_blocks(handle_t *handle,
> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 struct =
ext4_allocation_request *ar, int *errp)
> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 struct =
ext4_allocation_request *ar, int *errp,
> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 int fla=
gs)
> =A0{
> =A0 =A0 =A0 =A0int freed;
> =A0 =A0 =A0 =A0struct ext4_allocation_context *ac =3D NULL;
> @@ -4303,7 +4304,7 @@ ext4_fsblk_t ext4_mb_new_blocks(handle_t *handl=
e,
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 * there is enough free blocks to do b=
lock allocation
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 * and verify allocation doesn't excee=
d the quota limits.
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 */
> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 while (ar->len && ext4_claim_free_block=
s(sbi, ar->len)) {
> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 while (ar->len && ext4_claim_free_block=
s(sbi, ar->len, flags)) {
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0/* let others to free =
the space */
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0yield();
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0ar->len =3D ar->len >>=
 1;
> diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c
> index b545ca1..2d9b12c 100644
> --- a/fs/ext4/xattr.c
> +++ b/fs/ext4/xattr.c
> @@ -821,7 +821,7 @@ inserted:
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0goal =3D=
 goal & EXT4_MAX_BLOCK_FILE_PHYS;
>
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0block =3D ext4_new_met=
a_blocks(handle, inode,
> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0=
 =A0 =A0 =A0 =A0 =A0 =A0 =A0 goal, NULL, &error);
> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0=
 =A0 =A0 =A0 =A0 =A0 =A0 =A0 goal, NULL, &error, 0);
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0if (error)
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0goto c=
leanup;
>
> --
> 1.7.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-ext4"=
 in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at =A0http://vger.kernel.org/majordomo-info.html
>
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" i=
n
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html