The SCSI discard request merge never worked, and looks no solution
for in future, let's disable it temporarily.
Signed-off-by: NShaohua Li <shli@fusionio.com>
Reviewed-by: NChristoph Hellwig <hch@lst.de>
Signed-off-by: NJens Axboe <axboe@kernel.dk>