diff options
| author | Martin K. Petersen <martin.petersen@oracle.com> | 2014-10-28 20:27:43 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2014-10-28 20:27:43 -0600 |
| commit | cb1a5ab6ece7a37da4ac98ee26b0475b7c3ea79e (patch) | |
| tree | 1851aa4f04d1debab9312b25a6970c13d11eb5e7 /fs/locks.c | |
| parent | c21e59d8dc04b2107bdb4ff0f412a9b7ae3349f3 (diff) | |
| download | op-kernel-dev-cb1a5ab6ece7a37da4ac98ee26b0475b7c3ea79e.zip op-kernel-dev-cb1a5ab6ece7a37da4ac98ee26b0475b7c3ea79e.tar.gz | |
block: Fix merge logic when CONFIG_BLK_DEV_INTEGRITY is not defined
Commit 4eaf99beadce switched to returning bool and as a result reversed
the logic of the integrity merge checks. However, the empty stubs used
when the block integrity code is compiled out were still returning
0. Make these stubs return "true".
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Reported-by: Michael L. Semon <mlsemon35@gmail.com>
Tested-by: Michael L. Semon <mlsemon35@gmail.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'fs/locks.c')
0 files changed, 0 insertions, 0 deletions
