]> git.baikalelectronics.ru Git - kernel.git/commit
nilfs: fix breakage caused by barrier flag changes
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 29 Apr 2010 07:32:00 +0000 (09:32 +0200)
committerJens Axboe <jens.axboe@oracle.com>
Thu, 29 Apr 2010 07:32:00 +0000 (09:32 +0200)
commitbe0293c3cc6d65997b1f114fd7c28aacf571bc03
tree4a73ae4ce74be630b8862dcaf2a757f2f268ebbd
parent08bc220c86ca2eb695d1f2ed37c96962d550fb01
nilfs: fix breakage caused by barrier flag changes

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 f28149616c2fab55e24c88c6ed1f89202531acd5 ("blkdev:
generalize flags for blkdev_issue_fn functions") interacting with commit
8d7a67c1003150e5a5c6985f5f76f87b09ed58de ("nilfs2: issue discard request
after cleaning segments") (which netered Linus' tree on about March 4 -
before v2.6.34-rc1).

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
fs/nilfs2/the_nilfs.c