2010-04-30 16:48:28

by Stephen Rothwell

Subject: linux-next: build failure after merge of the block tree

Hi Jens,

After merging the block tree, today's linux-next build (powerpc ppc64_defconfig)
failed like this:

fs/nilfs2/the_nilfs.c: In function 'nilfs_discard_segments':
fs/nilfs2/the_nilfs.c:673: error: 'DISCARD_FL_BARRIER' undeclared (first use in this function)

Caused by commit fbd9b09a177a481eda256447c881f014f29034fe ("blkdev:
generalize flags for blkdev_issue_fn functions") interacting with commit
e902ec9906e844f4613fa6190c6fa65f162dc86e ("nilfs2: issue discard request
after cleaning segments") (which netered Linus' tree on about March 4 -
before v2.6.34-rc1).

I applied the following patch for today (but have no way to test it).

From: Stephen Rothwell <[email protected]>
Date: Thu, 29 Apr 2010 13:35:14 +1000
Subject: [PATCH] nilfs: fix for block layer API change

Signed-off-by: Stephen Rothwell <[email protected]>
---
fs/nilfs2/the_nilfs.c | 4 +-
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/nilfs2/the_nilfs.c b/fs/nilfs2/the_nilfs.c
index 33871f7..7081588 100644
--- a/fs/nilfs2/the_nilfs.c
+++ b/fs/nilfs2/the_nilfs.c
@@ -670,7 +670,7 @@ int nilfs_discard_segments(struct the_nilfs *nilfs, __u64 *segnump,
start * sects_per_block,
nblocks * sects_per_block,
GFP_NOFS,
- DISCARD_FL_BARRIER);
+ BLKDEV_IFL_BARRIER);
if (ret < 0)
return ret;
nblocks = 0;
@@ -680,7 +680,7 @@ int nilfs_discard_segments(struct the_nilfs *nilfs, __u64 *segnump,
ret = blkdev_issue_discard(nilfs->ns_bdev,
start * sects_per_block,
nblocks * sects_per_block,
- GFP_NOFS, DISCARD_FL_BARRIER);
+ GFP_NOFS, BLKDEV_IFL_BARRIER);
return ret;
}

--
1.7.1

--
Cheers,
Stephen Rothwell [email protected]

2010-04-30 16:55:44

by Jens Axboe

Subject: Re: linux-next: build failure after merge of the block tree

On Thu, Apr 29 2010, Stephen Rothwell wrote:
> Hi Jens,
>
> After merging the block tree, today's linux-next build (powerpc ppc64_defconfig)
> failed like this:
>
> fs/nilfs2/the_nilfs.c: In function 'nilfs_discard_segments':
> fs/nilfs2/the_nilfs.c:673: error: 'DISCARD_FL_BARRIER' undeclared (first use in this function)
>
> Caused by commit fbd9b09a177a481eda256447c881f014f29034fe ("blkdev:
> generalize flags for blkdev_issue_fn functions") interacting with commit
> e902ec9906e844f4613fa6190c6fa65f162dc86e ("nilfs2: issue discard request
> after cleaning segments") (which netered Linus' tree on about March 4 -
> before v2.6.34-rc1).
>
> I applied the following patch for today (but have no way to test it).

It's correct, I'll merge this.

--
Jens Axboe