History

block: Add BLK_ prefix to definitions

Add a BLK_ prefix to block layer constants.

Martin K. Petersen committed 16 years ago

Commit eb28d311 parent e751e763 files · +11 −7Browse files

Unified · Split

3 files
  1. block/blk-settings.c +2 −2
  2. drivers/block/ps3vram.c +2 −2
  3. include/linux/blkdev.h +7 −3
block/blk-settings.c+2−2
@@ -94,7 +94,7 @@ void blk_set_default_limits(struct queue_limits *lim) · 93 unmodified lines
9494 lim->max_phys_segments = MAX_PHYS_SEGMENTS;
9595 lim->max_hw_segments = MAX_HW_SEGMENTS;
9696 lim->seg_boundary_mask = BLK_SEG_BOUNDARY_MASK;
97− lim->max_segment_size = MAX_SEGMENT_SIZE;
97+ lim->max_segment_size = BLK_MAX_SEGMENT_SIZE;
9898 lim->max_sectors = BLK_DEF_MAX_SECTORS;
9999 lim->max_hw_sectors = INT_MAX;
100100 lim->max_discard_sectors = 0;
@@ -154,7 +154,7 @@ void blk_queue_make_request(struct request_queue *q, make_request_fn *mfn) · 53 unmodified lines
154154 q->unplug_timer.data = (unsigned long)q;
155155
156156 blk_set_default_limits(&q->limits);
157− blk_queue_max_sectors(q, SAFE_MAX_SECTORS);
157+ blk_queue_max_sectors(q, BLK_SAFE_MAX_SECTORS);
158158
159159 /*
160160 * If the caller didn't supply a lock, fall back to our embedded
drivers/block/ps3vram.c+2−2
@@ -753,8 +753,8 @@ static int __devinit ps3vram_probe(struct ps3_system_bus_device *dev) · 752 unmodified lines
753753 blk_queue_make_request(queue, ps3vram_make_request);
754754 blk_queue_max_phys_segments(queue, MAX_PHYS_SEGMENTS);
755755 blk_queue_max_hw_segments(queue, MAX_HW_SEGMENTS);
756− blk_queue_max_segment_size(queue, MAX_SEGMENT_SIZE);
757− blk_queue_max_sectors(queue, SAFE_MAX_SECTORS);
756+ blk_queue_max_segment_size(queue, BLK_MAX_SEGMENT_SIZE);
757+ blk_queue_max_sectors(queue, BLK_SAFE_MAX_SECTORS);
758758
759759 gendisk = alloc_disk(1);
760760 if (!gendisk) {
include/linux/blkdev.h+7−3
@@ -1016,11 +1016,15 @@ extern int blk_verify_command(unsigned char *cmd, fmode_t has_write_perm); · 1015 unmodified lines
10161016 #define MAX_PHYS_SEGMENTS 128
10171017 #define MAX_HW_SEGMENTS 128
10181018 #define SAFE_MAX_SECTORS 255
1019−#define BLK_DEF_MAX_SECTORS 1024
1020−
10211019 #define MAX_SEGMENT_SIZE 65536
10221020
1023−#define BLK_SEG_BOUNDARY_MASK 0xFFFFFFFFUL
1021+enum blk_default_limits {
1022+ BLK_MAX_SEGMENTS = 128,
1023+ BLK_SAFE_MAX_SECTORS = 255,
1024+ BLK_DEF_MAX_SECTORS = 1024,
1025+ BLK_MAX_SEGMENT_SIZE = 65536,
1026+ BLK_SEG_BOUNDARY_MASK = 0xFFFFFFFFUL,
1027+};
10241028
10251029 #define blkdev_entry_to_request(entry) list_entry((entry), struct request, queuelist)
10261030

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t