From: Jens Axboe <jens.axboe@oracle.com>
Date: Tue, 29 Jan 2008 21:25:18 +0000 (+0100)
Subject: as-iosched: fix double locking bug in as_merged_requests()
X-Git-Tag: v2.6.25-rc1~1147
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=149a051f82d2b3860fe32fa182dbc83a66274894;p=pandora-kernel.git

as-iosched: fix double locking bug in as_merged_requests()

If the two requests belong to the same io context, we will attempt
to lock the same lock twice. But swapping contexts is pointless in
that case, so just check for rioc == nioc before doing the double
lock and copy.

Tested-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
---

Reading git-diff-tree failed