Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6a47dc14 authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Jens Axboe
Browse files

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

Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
parent 0341aafb

fs/nilfs2/the_nilfs.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

}