Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[PATCH] dm: make sure QUEUE_FLAG_CLUSTER is set properly

Browse source 
This flag should be set for a virtual device iff it is set for all
underlying devices.

Signed-off-by: Neil Brown <neilb@suse.de>
Acked-by: Alasdair G Kergon <agk@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
NeilBrown 2006-03-27 01:17:49 -08:00 committed by Linus Torvalds
parent 4ee218cd67
commit 969429b504
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/md/dm-table.c
View file

@ -97,6 +97,8 @@ static void combine_restrictions_low(struct io_restrictions *lhs,
lhs->seg_boundary_mask = lhs->seg_boundary_mask =
min_not_zero(lhs->seg_boundary_mask, rhs->seg_boundary_mask); min_not_zero(lhs->seg_boundary_mask, rhs->seg_boundary_mask);
lhs->no_cluster |= rhs->no_cluster;
} }
/* /*
@ -523,6 +525,8 @@ int dm_get_device(struct dm_target *ti, const char *path, sector_t start,
rs->seg_boundary_mask = rs->seg_boundary_mask =
min_not_zero(rs->seg_boundary_mask, min_not_zero(rs->seg_boundary_mask,
q->seg_boundary_mask); q->seg_boundary_mask);
rs->no_cluster |= !test_bit(QUEUE_FLAG_CLUSTER, &q->queue_flags);
} }
return r; return r;
@ -832,6 +836,11 @@ void dm_table_set_restrictions(struct dm_table *t, struct request_queue *q)
q->hardsect_size = t->limits.hardsect_size; q->hardsect_size = t->limits.hardsect_size;
q->max_segment_size = t->limits.max_segment_size; q->max_segment_size = t->limits.max_segment_size;
q->seg_boundary_mask = t->limits.seg_boundary_mask; q->seg_boundary_mask = t->limits.seg_boundary_mask;
if (t->limits.no_cluster)
q->queue_flags &= ~(1 << QUEUE_FLAG_CLUSTER);
else
q->queue_flags |= (1 << QUEUE_FLAG_CLUSTER);
} }
unsigned int dm_table_get_num_targets(struct dm_table *t) unsigned int dm_table_get_num_targets(struct dm_table *t)

1
include/linux/device-mapper.h
View file

@ -97,6 +97,7 @@ struct io_restrictions {
unsigned short hardsect_size; unsigned short hardsect_size;
unsigned int max_segment_size; unsigned int max_segment_size;
unsigned long seg_boundary_mask; unsigned long seg_boundary_mask;
unsigned char no_cluster; /* inverted so that 0 is default */
}; };
struct dm_target { struct dm_target {