dm persistent data: rename node to btree_node
authorMikulas Patocka <mpatocka@redhat.com>
Fri, 21 Dec 2012 20:23:30 +0000 (20:23 +0000)
committerBen Hutchings <ben@decadent.org.uk>
Thu, 3 Jan 2013 03:33:46 +0000 (03:33 +0000)
commit3d4adaa4374fef55014b1306fd5def3f5bb6d548
treed1037e790817fcc0521f19b110b60c418729988d
parent4b8bb650d4d1cafca4e69914cbd8c808c57f5bbe
dm persistent data: rename node to btree_node

commit 550929faf89e2e2cdb3e9945ea87d383989274cf upstream.

This patch fixes a compilation failure on sparc32 by renaming struct node.

struct node is already defined in include/linux/node.h. On sparc32, it
happens to be included through other dependencies and persistent-data
doesn't compile because of conflicting declarations.

Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
Signed-off-by: Alasdair G Kergon <agk@redhat.com>
[bwh: Backported to 3.2: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
drivers/md/persistent-data/dm-btree-internal.h
drivers/md/persistent-data/dm-btree-remove.c
drivers/md/persistent-data/dm-btree-spine.c
drivers/md/persistent-data/dm-btree.c