The following commit has been merged in the linux branch: commit bca915aae803cf01fde4461fc9c093cf5a86d7fc Author: Andrew Morton akpm@linux-foundation.org Date: Fri Oct 16 23:18:15 2009 +0100

dm log: userspace fix incorrect luid cast in userspace_ctr

mips:

drivers/md/dm-log-userspace-base.c: In function `userspace_ctr': drivers/md/dm-log-userspace-base.c:159: warning: cast from pointer to integer of different size

Cc: stable@kernel.org Cc: Jonathan Brassow jbrassow@redhat.com Signed-off-by: Andrew Morton akpm@linux-foundation.org Signed-off-by: Alasdair G Kergon agk@redhat.com

diff --git a/drivers/md/dm-log-userspace-base.c b/drivers/md/dm-log-userspace-base.c index 652bd33..7ac2c14 100644 --- a/drivers/md/dm-log-userspace-base.c +++ b/drivers/md/dm-log-userspace-base.c @@ -156,7 +156,7 @@ static int userspace_ctr(struct dm_dirty_log *log, struct dm_target *ti, }

/* The ptr value is sufficient for local unique id */ - lc->luid = (uint64_t)lc; + lc->luid = (unsigned long)lc;

lc->ti = ti;