Hi,
today, I pulled linux-2.6-block/for-next GIT branch [1] on top of
Linus-tree (2.6.36-rc8-git3).
Unfortunately, ext4/next GIT branch [2] is not "GIT-pull-able" on top
of this local GIT repository.
The cause for this is the removal of BLKDEV_IFL_BARRIER and
BLKDEV_IFL_WAIT in linux-2.6-block/for-next.
As there are few days left for 2.6.36-final, it would be great when
ext4/next could be prepared to work with linux-2.6-block/for-next.
Thanks in advance.
Kind Regards,
- Sedat -
[1] http://git.kernel.org/?p=linux/kernel/git/axboe/linux-2.6-block.git;a=shortlog;h=refs/heads/for-next
[2] http://git.kernel.org/?p=linux/kernel/git/tytso/ext4.git;a=shortlog;h=refs/heads/next
On 2010-10-18 02:11, Sedat Dilek wrote:
> Hi,
>
> today, I pulled linux-2.6-block/for-next GIT branch [1] on top of
> Linus-tree (2.6.36-rc8-git3).
>
> Unfortunately, ext4/next GIT branch [2] is not "GIT-pull-able" on top
> of this local GIT repository.
> The cause for this is the removal of BLKDEV_IFL_BARRIER and
> BLKDEV_IFL_WAIT in linux-2.6-block/for-next.
>
> As there are few days left for 2.6.36-final, it would be great when
> ext4/next could be prepared to work with linux-2.6-block/for-next.
> Thanks in advance.
The argument just has to be removed. linux-next has had a fixup
patch for this for a long time.
--
Jens Axboe
Hi Jens,
thanks for the fast reply.
I had a quick view on my local GIT repository after pulling both GIT branches.
Does this attached (untested) patch fix the seen issues?
Thanks in advance.
Kind Regards,
- Sedat -
On Mon, Oct 18, 2010 at 9:13 AM, Jens Axboe <[email protected]> wrote:
> On 2010-10-18 02:11, Sedat Dilek wrote:
>> Hi,
>>
>> today, I pulled linux-2.6-block/for-next GIT branch [1] on top of
>> Linus-tree (2.6.36-rc8-git3).
>>
>> Unfortunately, ext4/next GIT branch [2] is not "GIT-pull-able" on top
>> of this local GIT repository.
>> The cause for this is the removal of BLKDEV_IFL_BARRIER and
>> BLKDEV_IFL_WAIT in linux-2.6-block/for-next.
>>
>> As there are few days left for 2.6.36-final, it would be great when
>> ext4/next could be prepared to work with linux-2.6-block/for-next.
>> Thanks in advance.
>
> The argument just has to be removed. linux-next has had a fixup
> patch for this for a long time.
>
> --
> Jens Axboe
>
>
Commit 4bcf787b503fa96c5a2f529ce15807dc670853ed from ext4/next [1]:
"Add helper function for blkdev_issue_zeroout (sb_issue_discard)"
...lead to some rework of my initial patch, so here is v2 attached.
As blkdev_issue_zeroout() has no more "flags", this has to be
considered also in sb_issue_zeroout() and also in my v2 patch.
[ block/blk-lib.c ]
...
int blkdev_issue_zeroout(struct block_device *bdev, sector_t sector,
sector_t nr_sects, gfp_t gfp_mask)
...
Looks like this is compiling w/o errors in fs/ext4 tree.
- Sedat -
[1] http://git.kernel.org/?p=linux/kernel/git/tytso/ext4.git;a=commit;h=4bcf787b503fa96c5a2f529ce15807dc670853ed
On Mon, Oct 18, 2010 at 9:13 AM, Jens Axboe <[email protected]> wrote:
> On 2010-10-18 02:11, Sedat Dilek wrote:
>> Hi,
>>
>> today, I pulled linux-2.6-block/for-next GIT branch [1] on top of
>> Linus-tree (2.6.36-rc8-git3).
>>
>> Unfortunately, ext4/next GIT branch [2] is not "GIT-pull-able" on top
>> of this local GIT repository.
>> The cause for this is the removal of BLKDEV_IFL_BARRIER and
>> BLKDEV_IFL_WAIT in linux-2.6-block/for-next.
>>
>> As there are few days left for 2.6.36-final, it would be great when
>> ext4/next could be prepared to work with linux-2.6-block/for-next.
>> Thanks in advance.
>
> The argument just has to be removed. linux-next has had a fixup
> patch for this for a long time.
>
> --
> Jens Axboe
>
>
Linux-next patch from [1] has both tree merged and resolved the conflicts.
I could successfully compile it, now.
$ cat /proc/version
Linux version 2.6.36-rc8-686 (Debian
2.6.36~rc8-3~next~20101018~dileks.1) ([email protected]) (gcc
version 4.4.5 (Debian 4.4.5-4) ) #1 SMP Tue Oct 19 00:38:54 CEST 2010
- Sedat -
[1] http://www.kernel.org/pub/linux/kernel/v2.6/next/patch-v2.6.36-rc8-next-20101018.bz2
On Mon, Oct 18, 2010 at 9:13 AM, Jens Axboe <[email protected]> wrote:
> On 2010-10-18 02:11, Sedat Dilek wrote:
>> Hi,
>>
>> today, I pulled linux-2.6-block/for-next GIT branch [1] on top of
>> Linus-tree (2.6.36-rc8-git3).
>>
>> Unfortunately, ext4/next GIT branch [2] is not "GIT-pull-able" on top
>> of this local GIT repository.
>> The cause for this is the removal of BLKDEV_IFL_BARRIER and
>> BLKDEV_IFL_WAIT in linux-2.6-block/for-next.
>>
>> As there are few days left for 2.6.36-final, it would be great when
>> ext4/next could be prepared to work with linux-2.6-block/for-next.
>> Thanks in advance.
>
> The argument just has to be removed. linux-next has had a fixup
> patch for this for a long time.
>
> --
> Jens Axboe
>
>