include/linux/genhd.h

   1 #ifndef _LINUX_GENHD_H
   2 #define _LINUX_GENHD_H
   3
   4 /*
   5  *      genhd.h Copyright (C) 1992 Drew Eckhardt
   6  *      Generic hard disk header file by
   7  *              Drew Eckhardt
   8  *
   9  *              <drew@colorado.edu>
  10  */
  11
  12 #include <linux/types.h>
  13 #include <linux/kdev_t.h>
  14
  15 #ifdef CONFIG_BLOCK
  16
  17 #define kobj_to_dev(k) container_of(k, struct device, kobj)
  18 #define dev_to_disk(device) container_of(device, struct gendisk, dev)
  19 #define dev_to_part(device) container_of(device, struct hd_struct, dev)
  20
  21 <<<<<<< HEAD:include/linux/genhd.h
  22 extern struct device_type disk_type;
  23 =======
  24 >>>>>>> 264e3e889d86e552b4191d69bb60f4f3b383135a:include/linux/genhd.h
  25 extern struct device_type part_type;
  26 extern struct kobject *block_depr;
  27 extern struct class block_class;
  28
  29 <<<<<<< HEAD:include/linux/genhd.h
  30 =======
  31 extern const struct seq_operations partitions_op;
  32 extern const struct seq_operations diskstats_op;
  33
  34 >>>>>>> 264e3e889d86e552b4191d69bb60f4f3b383135a:include/linux/genhd.h
  35 enum {
  36 /* These three have identical behaviour; use the second one if DOS FDISK gets
  37    confused about extended/logical partitions starting past cylinder 1023. */
  38         DOS_EXTENDED_PARTITION = 5,
  39         LINUX_EXTENDED_PARTITION = 0x85,
  40         WIN98_EXTENDED_PARTITION = 0x0f,
  41
  42         SUN_WHOLE_DISK = DOS_EXTENDED_PARTITION,
  43
  44         LINUX_SWAP_PARTITION = 0x82,
  45         LINUX_DATA_PARTITION = 0x83,
  46         LINUX_LVM_PARTITION = 0x8e,
  47         LINUX_RAID_PARTITION = 0xfd,    /* autodetect RAID partition */
  48
  49         SOLARIS_X86_PARTITION = LINUX_SWAP_PARTITION,
  50         NEW_SOLARIS_X86_PARTITION = 0xbf,
  51
  52         DM6_AUX1PARTITION = 0x51,       /* no DDO:  use xlated geom */
  53         DM6_AUX3PARTITION = 0x53,       /* no DDO:  use xlated geom */
  54         DM6_PARTITION = 0x54,           /* has DDO: use xlated geom & offset */
  55         EZD_PARTITION = 0x55,           /* EZ-DRIVE */
  56
  57         FREEBSD_PARTITION = 0xa5,       /* FreeBSD Partition ID */
  58         OPENBSD_PARTITION = 0xa6,       /* OpenBSD Partition ID */
  59         NETBSD_PARTITION = 0xa9,        /* NetBSD Partition ID */
  60         BSDI_PARTITION = 0xb7,          /* BSDI Partition ID */
  61         MINIX_PARTITION = 0x81,         /* Minix Partition ID */
  62         UNIXWARE_PARTITION = 0x63,      /* Same as GNU_HURD and SCO Unix */
  63 };
  64
  65 <<<<<<< HEAD:include/linux/genhd.h
  66 #ifndef __KERNEL__
  67
  68 struct partition {
  69         unsigned char boot_ind;         /* 0x80 - active */
  70         unsigned char head;             /* starting head */
  71         unsigned char sector;           /* starting sector */
  72         unsigned char cyl;              /* starting cylinder */
  73         unsigned char sys_ind;          /* What partition type */
  74         unsigned char end_head;         /* end head */
  75         unsigned char end_sector;       /* end sector */
  76         unsigned char end_cyl;          /* end cylinder */
  77         unsigned int start_sect;        /* starting sector counting from 0 */
  78         unsigned int nr_sects;          /* nr of sectors in partition */
  79 } __attribute__((packed));
  80
  81 #endif
  82
  83 #ifdef __KERNEL__
  84 =======
  85 >>>>>>> 264e3e889d86e552b4191d69bb60f4f3b383135a:include/linux/genhd.h
  86 #include <linux/major.h>
  87 #include <linux/device.h>
  88 #include <linux/smp.h>
  89 #include <linux/string.h>
  90 #include <linux/fs.h>
  91 #include <linux/workqueue.h>
  92
  93 struct partition {
  94         unsigned char boot_ind;         /* 0x80 - active */
  95         unsigned char head;             /* starting head */
  96         unsigned char sector;           /* starting sector */
  97         unsigned char cyl;              /* starting cylinder */
  98         unsigned char sys_ind;          /* What partition type */
  99         unsigned char end_head;         /* end head */
 100         unsigned char end_sector;       /* end sector */
 101         unsigned char end_cyl;          /* end cylinder */
 102         __le32 start_sect;      /* starting sector counting from 0 */
 103         __le32 nr_sects;                /* nr of sectors in partition */
 104 } __attribute__((packed));
 105
 106 struct disk_stats {
 107         unsigned long sectors[2];       /* READs and WRITEs */
 108         unsigned long ios[2];
 109         unsigned long merges[2];
 110         unsigned long ticks[2];
 111         unsigned long io_ticks;
 112         unsigned long time_in_queue;
 113 };
 114
 115 struct hd_struct {
 116         sector_t start_sect;
 117         sector_t nr_sects;
 118         struct device dev;
 119         struct kobject *holder_dir;
 120         int policy, partno;
 121 #ifdef CONFIG_FAIL_MAKE_REQUEST
 122         int make_it_fail;
 123 #endif
 124         unsigned long stamp;
 125         int in_flight;
 126 #ifdef  CONFIG_SMP
 127         struct disk_stats *dkstats;
 128 #else
 129         struct disk_stats dkstats;
 130 #endif
 131 };
 132
 133 #define GENHD_FL_REMOVABLE                      1
 134 #define GENHD_FL_DRIVERFS                       2
 135 #define GENHD_FL_MEDIA_CHANGE_NOTIFY            4
 136 #define GENHD_FL_CD                             8
 137 #define GENHD_FL_UP                             16
 138 #define GENHD_FL_SUPPRESS_PARTITION_INFO        32
 139 #define GENHD_FL_FAIL                           64
 140
 141
 142 struct gendisk {
 143         int major;                      /* major number of driver */
 144         int first_minor;
 145         int minors;                     /* maximum number of minors, =1 for
 146                                          * disks that can't be partitioned. */
 147         char disk_name[32];             /* name of major driver */
 148         struct hd_struct **part;        /* [indexed by minor] */
 149         struct block_device_operations *fops;
 150         struct request_queue *queue;
 151         void *private_data;
 152         sector_t capacity;
 153
 154         int flags;
 155         struct device *driverfs_dev;  // FIXME: remove
 156         struct device dev;
 157         struct kobject *holder_dir;
 158         struct kobject *slave_dir;
 159
 160         struct timer_rand_state *random;
 161         int policy;
 162
 163         atomic_t sync_io;               /* RAID */
 164         unsigned long stamp;
 165         int in_flight;
 166 #ifdef  CONFIG_SMP
 167         struct disk_stats *dkstats;
 168 #else
 169         struct disk_stats dkstats;
 170 #endif
 171         struct work_struct async_notify;
 172 };
 173
 174 /*
 175  * Macros to operate on percpu disk statistics:
 176  *
 177  * The __ variants should only be called in critical sections. The full
 178  * variants disable/enable preemption.
 179  */
 180 static inline struct hd_struct *get_part(struct gendisk *gendiskp,
 181                                          sector_t sector)
 182 {
 183         struct hd_struct *part;
 184         int i;
 185         for (i = 0; i < gendiskp->minors - 1; i++) {
 186                 part = gendiskp->part[i];
 187                 if (part && part->start_sect <= sector
 188                     && sector < part->start_sect + part->nr_sects)
 189                         return part;
 190         }
 191         return NULL;
 192 }
 193
 194 #ifdef  CONFIG_SMP
 195 #define __disk_stat_add(gendiskp, field, addnd)         \
 196         (per_cpu_ptr(gendiskp->dkstats, smp_processor_id())->field += addnd)
 197
 198 #define disk_stat_read(gendiskp, field)                                 \
 199 ({                                                                      \
 200         typeof(gendiskp->dkstats->field) res = 0;                       \
 201         int i;                                                          \
 202         for_each_possible_cpu(i)                                        \
 203                 res += per_cpu_ptr(gendiskp->dkstats, i)->field;        \
 204         res;                                                            \
 205 })
 206
 207 static inline void disk_stat_set_all(struct gendisk *gendiskp, int value)       {
 208         int i;
 209         for_each_possible_cpu(i)
 210                 memset(per_cpu_ptr(gendiskp->dkstats, i), value,
 211                                 sizeof (struct disk_stats));
 212 }
 213
 214 #define __part_stat_add(part, field, addnd)                             \
 215         (per_cpu_ptr(part->dkstats, smp_processor_id())->field += addnd)
 216
 217 #define __all_stat_add(gendiskp, field, addnd, sector)          \
 218 ({                                                              \
 219         struct hd_struct *part = get_part(gendiskp, sector);    \
 220         if (part)                                               \
 221                 __part_stat_add(part, field, addnd);            \
 222         __disk_stat_add(gendiskp, field, addnd);                \
 223 })
 224
 225 #define part_stat_read(part, field)                                     \
 226 ({                                                                      \
 227         typeof(part->dkstats->field) res = 0;                           \
 228         int i;                                                          \
 229         for_each_possible_cpu(i)                                        \
 230                 res += per_cpu_ptr(part->dkstats, i)->field;            \
 231         res;                                                            \
 232 })
 233
 234 static inline void part_stat_set_all(struct hd_struct *part, int value) {
 235         int i;
 236         for_each_possible_cpu(i)
 237                 memset(per_cpu_ptr(part->dkstats, i), value,
 238                        sizeof(struct disk_stats));
 239 }
 240
 241 <<<<<<< HEAD:include/linux/genhd.h
 242 #else
 243 =======
 244 #else /* !CONFIG_SMP */
 245 >>>>>>> 264e3e889d86e552b4191d69bb60f4f3b383135a:include/linux/genhd.h
 246 #define __disk_stat_add(gendiskp, field, addnd) \
 247                                 (gendiskp->dkstats.field += addnd)
 248 #define disk_stat_read(gendiskp, field) (gendiskp->dkstats.field)
 249
 250 static inline void disk_stat_set_all(struct gendisk *gendiskp, int value)
 251 {
 252         memset(&gendiskp->dkstats, value, sizeof (struct disk_stats));
 253 }
 254
 255 #define __part_stat_add(part, field, addnd) \
 256         (part->dkstats.field += addnd)
 257
 258 #define __all_stat_add(gendiskp, field, addnd, sector)          \
 259 ({                                                              \
 260         struct hd_struct *part = get_part(gendiskp, sector);    \
 261         if (part)                                               \
 262                 part->dkstats.field += addnd;                   \
 263         __disk_stat_add(gendiskp, field, addnd);                \
 264 })
 265
 266 #define part_stat_read(part, field)     (part->dkstats.field)
 267
 268 static inline void part_stat_set_all(struct hd_struct *part, int value)
 269 {
 270         memset(&part->dkstats, value, sizeof(struct disk_stats));
 271 }
 272
 273 <<<<<<< HEAD:include/linux/genhd.h
 274 #endif
 275 =======
 276 #endif /* CONFIG_SMP */
 277 >>>>>>> 264e3e889d86e552b4191d69bb60f4f3b383135a:include/linux/genhd.h
 278
 279 #define disk_stat_add(gendiskp, field, addnd)                   \
 280         do {                                                    \
 281                 preempt_disable();                              \
 282                 __disk_stat_add(gendiskp, field, addnd);        \
 283                 preempt_enable();                               \
 284         } while (0)
 285
 286 #define __disk_stat_dec(gendiskp, field) __disk_stat_add(gendiskp, field, -1)
 287 #define disk_stat_dec(gendiskp, field) disk_stat_add(gendiskp, field, -1)
 288
 289 #define __disk_stat_inc(gendiskp, field) __disk_stat_add(gendiskp, field, 1)
 290 #define disk_stat_inc(gendiskp, field) disk_stat_add(gendiskp, field, 1)
 291
 292 #define __disk_stat_sub(gendiskp, field, subnd) \
 293                 __disk_stat_add(gendiskp, field, -subnd)
 294 #define disk_stat_sub(gendiskp, field, subnd) \
 295                 disk_stat_add(gendiskp, field, -subnd)
 296
 297 #define part_stat_add(gendiskp, field, addnd)           \
 298         do {                                            \
 299                 preempt_disable();                      \
 300                 __part_stat_add(gendiskp, field, addnd);\
 301                 preempt_enable();                       \
 302         } while (0)
 303
 304 #define __part_stat_dec(gendiskp, field) __part_stat_add(gendiskp, field, -1)
 305 #define part_stat_dec(gendiskp, field) part_stat_add(gendiskp, field, -1)
 306
 307 #define __part_stat_inc(gendiskp, field) __part_stat_add(gendiskp, field, 1)
 308 #define part_stat_inc(gendiskp, field) part_stat_add(gendiskp, field, 1)
 309
 310 #define __part_stat_sub(gendiskp, field, subnd) \
 311                 __part_stat_add(gendiskp, field, -subnd)
 312 #define part_stat_sub(gendiskp, field, subnd) \
 313                 part_stat_add(gendiskp, field, -subnd)
 314
 315 #define all_stat_add(gendiskp, field, addnd, sector)            \
 316         do {                                                    \
 317                 preempt_disable();                              \
 318                 __all_stat_add(gendiskp, field, addnd, sector); \
 319                 preempt_enable();                               \
 320         } while (0)
 321
 322 #define __all_stat_dec(gendiskp, field, sector) \
 323                 __all_stat_add(gendiskp, field, -1, sector)
 324 #define all_stat_dec(gendiskp, field, sector) \
 325                 all_stat_add(gendiskp, field, -1, sector)
 326
 327 #define __all_stat_inc(gendiskp, field, sector) \
 328                 __all_stat_add(gendiskp, field, 1, sector)
 329 #define all_stat_inc(gendiskp, field, sector) \
 330                 all_stat_add(gendiskp, field, 1, sector)
 331
 332 #define __all_stat_sub(gendiskp, field, subnd, sector) \
 333                 __all_stat_add(gendiskp, field, -subnd, sector)
 334 #define all_stat_sub(gendiskp, field, subnd, sector) \
 335                 all_stat_add(gendiskp, field, -subnd, sector)
 336
 337 /* Inlines to alloc and free disk stats in struct gendisk */
 338 #ifdef  CONFIG_SMP
 339 static inline int init_disk_stats(struct gendisk *disk)
 340 {
 341         disk->dkstats = alloc_percpu(struct disk_stats);
 342         if (!disk->dkstats)
 343                 return 0;
 344         return 1;
 345 }
 346
 347 static inline void free_disk_stats(struct gendisk *disk)
 348 {
 349         free_percpu(disk->dkstats);
 350 }
 351
 352 static inline int init_part_stats(struct hd_struct *part)
 353 {
 354         part->dkstats = alloc_percpu(struct disk_stats);
 355         if (!part->dkstats)
 356                 return 0;
 357         return 1;
 358 }
 359
 360 static inline void free_part_stats(struct hd_struct *part)
 361 {
 362         free_percpu(part->dkstats);
 363 }
 364
 365 #else   /* CONFIG_SMP */
 366 static inline int init_disk_stats(struct gendisk *disk)
 367 {
 368         return 1;
 369 }
 370
 371 static inline void free_disk_stats(struct gendisk *disk)
 372 {
 373 }
 374
 375 static inline int init_part_stats(struct hd_struct *part)
 376 {
 377         return 1;
 378 }
 379
 380 static inline void free_part_stats(struct hd_struct *part)
 381 {
 382 }
 383 #endif  /* CONFIG_SMP */
 384
 385 /* drivers/block/ll_rw_blk.c */
 386 extern void disk_round_stats(struct gendisk *disk);
 387 extern void part_round_stats(struct hd_struct *part);
 388
 389 /* drivers/block/genhd.c */
 390 extern int get_blkdev_list(char *, int);
 391 extern void add_disk(struct gendisk *disk);
 392 extern void del_gendisk(struct gendisk *gp);
 393 extern void unlink_gendisk(struct gendisk *gp);
 394 extern struct gendisk *get_gendisk(dev_t dev, int *part);
 395
 396 extern void set_device_ro(struct block_device *bdev, int flag);
 397 extern void set_disk_ro(struct gendisk *disk, int flag);
 398
 399 /* drivers/char/random.c */
 400 extern void add_disk_randomness(struct gendisk *disk);
 401 extern void rand_initialize_disk(struct gendisk *disk);
 402
 403 static inline sector_t get_start_sect(struct block_device *bdev)
 404 {
 405         return bdev->bd_contains == bdev ? 0 : bdev->bd_part->start_sect;
 406 }
 407 static inline sector_t get_capacity(struct gendisk *disk)
 408 {
 409         return disk->capacity;
 410 }
 411 static inline void set_capacity(struct gendisk *disk, sector_t size)
 412 {
 413         disk->capacity = size;
 414 }
 415
 416 <<<<<<< HEAD:include/linux/genhd.h
 417 #endif  /*  __KERNEL__  */
 418
 419 =======
 420 >>>>>>> 264e3e889d86e552b4191d69bb60f4f3b383135a:include/linux/genhd.h
 421 #ifdef CONFIG_SOLARIS_X86_PARTITION
 422
 423 #define SOLARIS_X86_NUMSLICE    16
 424 #define SOLARIS_X86_VTOC_SANE   (0x600DDEEEUL)
 425
 426 struct solaris_x86_slice {
 427         __le16 s_tag;           /* ID tag of partition */
 428         __le16 s_flag;          /* permission flags */
 429         __le32 s_start;         /* start sector no of partition */
 430         __le32 s_size;          /* # of blocks in partition */
 431 };
 432
 433 struct solaris_x86_vtoc {
 434         unsigned int v_bootinfo[3];     /* info needed by mboot (unsupported) */
 435         __le32 v_sanity;                /* to verify vtoc sanity */
 436         __le32 v_version;               /* layout version */
 437         char    v_volume[8];            /* volume name */
 438         __le16  v_sectorsz;             /* sector size in bytes */
 439         __le16  v_nparts;               /* number of partitions */
 440         unsigned int v_reserved[10];    /* free space */
 441         struct solaris_x86_slice
 442                 v_slice[SOLARIS_X86_NUMSLICE]; /* slice headers */
 443         unsigned int timestamp[SOLARIS_X86_NUMSLICE]; /* timestamp (unsupported) */
 444         char    v_asciilabel[128];      /* for compatibility */
 445 };
 446
 447 #endif /* CONFIG_SOLARIS_X86_PARTITION */
 448
 449 #ifdef CONFIG_BSD_DISKLABEL
 450 /*
 451  * BSD disklabel support by Yossi Gottlieb <yogo@math.tau.ac.il>
 452  * updated by Marc Espie <Marc.Espie@openbsd.org>
 453  */
 454
 455 /* check against BSD src/sys/sys/disklabel.h for consistency */
 456
 457 #define BSD_DISKMAGIC   (0x82564557UL)  /* The disk magic number */
 458 #define BSD_MAXPARTITIONS       16
 459 #define OPENBSD_MAXPARTITIONS   16
 460 #define BSD_FS_UNUSED           0       /* disklabel unused partition entry ID */
 461 struct bsd_disklabel {
 462         __le32  d_magic;                /* the magic number */
 463         __s16   d_type;                 /* drive type */
 464         __s16   d_subtype;              /* controller/d_type specific */
 465         char    d_typename[16];         /* type name, e.g. "eagle" */
 466         char    d_packname[16];                 /* pack identifier */
 467         __u32   d_secsize;              /* # of bytes per sector */
 468         __u32   d_nsectors;             /* # of data sectors per track */
 469         __u32   d_ntracks;              /* # of tracks per cylinder */
 470         __u32   d_ncylinders;           /* # of data cylinders per unit */
 471         __u32   d_secpercyl;            /* # of data sectors per cylinder */
 472         __u32   d_secperunit;           /* # of data sectors per unit */
 473         __u16   d_sparespertrack;       /* # of spare sectors per track */
 474         __u16   d_sparespercyl;         /* # of spare sectors per cylinder */
 475         __u32   d_acylinders;           /* # of alt. cylinders per unit */
 476         __u16   d_rpm;                  /* rotational speed */
 477         __u16   d_interleave;           /* hardware sector interleave */
 478         __u16   d_trackskew;            /* sector 0 skew, per track */
 479         __u16   d_cylskew;              /* sector 0 skew, per cylinder */
 480         __u32   d_headswitch;           /* head switch time, usec */
 481         __u32   d_trkseek;              /* track-to-track seek, usec */
 482         __u32   d_flags;                /* generic flags */
 483 #define NDDATA 5
 484         __u32   d_drivedata[NDDATA];    /* drive-type specific information */
 485 #define NSPARE 5
 486         __u32   d_spare[NSPARE];        /* reserved for future use */
 487         __le32  d_magic2;               /* the magic number (again) */
 488         __le16  d_checksum;             /* xor of data incl. partitions */
 489
 490                         /* filesystem and partition information: */
 491         __le16  d_npartitions;          /* number of partitions in following */
 492         __le32  d_bbsize;               /* size of boot area at sn0, bytes */
 493         __le32  d_sbsize;               /* max size of fs superblock, bytes */
 494         struct  bsd_partition {         /* the partition table */
 495                 __le32  p_size;         /* number of sectors in partition */
 496                 __le32  p_offset;       /* starting sector */
 497                 __le32  p_fsize;        /* filesystem basic fragment size */
 498                 __u8    p_fstype;       /* filesystem type, see below */
 499                 __u8    p_frag;         /* filesystem fragments per block */
 500                 __le16  p_cpg;          /* filesystem cylinders per group */
 501         } d_partitions[BSD_MAXPARTITIONS];      /* actually may be more */
 502 };
 503
 504 #endif  /* CONFIG_BSD_DISKLABEL */
 505
 506 #ifdef CONFIG_UNIXWARE_DISKLABEL
 507 /*
 508  * Unixware slices support by Andrzej Krzysztofowicz <ankry@mif.pg.gda.pl>
 509  * and Krzysztof G. Baranowski <kgb@knm.org.pl>
 510  */
 511
 512 #define UNIXWARE_DISKMAGIC     (0xCA5E600DUL)   /* The disk magic number */
 513 #define UNIXWARE_DISKMAGIC2    (0x600DDEEEUL)   /* The slice table magic nr */
 514 #define UNIXWARE_NUMSLICE      16
 515 #define UNIXWARE_FS_UNUSED     0                /* Unused slice entry ID */
 516
 517 struct unixware_slice {
 518         __le16   s_label;       /* label */
 519         __le16   s_flags;       /* permission flags */
 520         __le32   start_sect;    /* starting sector */
 521         __le32   nr_sects;      /* number of sectors in slice */
 522 };
 523
 524 struct unixware_disklabel {
 525         __le32   d_type;                /* drive type */
 526         __le32   d_magic;                /* the magic number */
 527         __le32   d_version;              /* version number */
 528         char    d_serial[12];           /* serial number of the device */
 529         __le32   d_ncylinders;           /* # of data cylinders per device */
 530         __le32   d_ntracks;              /* # of tracks per cylinder */
 531         __le32   d_nsectors;             /* # of data sectors per track */
 532         __le32   d_secsize;              /* # of bytes per sector */
 533         __le32   d_part_start;           /* # of first sector of this partition */
 534         __le32   d_unknown1[12];         /* ? */
 535         __le32  d_alt_tbl;              /* byte offset of alternate table */
 536         __le32  d_alt_len;              /* byte length of alternate table */
 537         __le32  d_phys_cyl;             /* # of physical cylinders per device */
 538         __le32  d_phys_trk;             /* # of physical tracks per cylinder */
 539         __le32  d_phys_sec;             /* # of physical sectors per track */
 540         __le32  d_phys_bytes;           /* # of physical bytes per sector */
 541         __le32  d_unknown2;             /* ? */
 542         __le32   d_unknown3;             /* ? */
 543         __le32  d_pad[8];               /* pad */
 544
 545         struct unixware_vtoc {
 546                 __le32  v_magic;                /* the magic number */
 547                 __le32  v_version;              /* version number */
 548                 char    v_name[8];              /* volume name */
 549                 __le16  v_nslices;              /* # of slices */
 550                 __le16  v_unknown1;             /* ? */
 551                 __le32  v_reserved[10];         /* reserved */
 552                 struct unixware_slice
 553                         v_slice[UNIXWARE_NUMSLICE];     /* slice headers */
 554         } vtoc;
 555
 556 };  /* 408 */
 557
 558 #endif /* CONFIG_UNIXWARE_DISKLABEL */
 559
 560 #ifdef CONFIG_MINIX_SUBPARTITION
 561 #   define MINIX_NR_SUBPARTITIONS  4
 562 #endif /* CONFIG_MINIX_SUBPARTITION */
 563
 564 <<<<<<< HEAD:include/linux/genhd.h
 565 #ifdef __KERNEL__
 566
 567 =======
 568 >>>>>>> 264e3e889d86e552b4191d69bb60f4f3b383135a:include/linux/genhd.h
 569 #define ADDPART_FLAG_NONE       0
 570 #define ADDPART_FLAG_RAID       1
 571 #define ADDPART_FLAG_WHOLEDISK  2
 572
 573 extern dev_t blk_lookup_devt(const char *name);
 574 extern char *disk_name (struct gendisk *hd, int part, char *buf);
 575
 576 extern int rescan_partitions(struct gendisk *disk, struct block_device *bdev);
 577 extern void add_partition(struct gendisk *, int, sector_t, sector_t, int);
 578 extern void delete_partition(struct gendisk *, int);
 579 extern void printk_all_partitions(void);
 580
 581 extern struct gendisk *alloc_disk_node(int minors, int node_id);
 582 extern struct gendisk *alloc_disk(int minors);
 583 extern struct kobject *get_disk(struct gendisk *disk);
 584 extern void put_disk(struct gendisk *disk);
 585 <<<<<<< HEAD:include/linux/genhd.h
 586 extern void genhd_media_change_notify(struct gendisk *disk);
 587 =======
 588 >>>>>>> 264e3e889d86e552b4191d69bb60f4f3b383135a:include/linux/genhd.h
 589 extern void blk_register_region(dev_t devt, unsigned long range,
 590                         struct module *module,
 591                         struct kobject *(*probe)(dev_t, int *, void *),
 592                         int (*lock)(dev_t, void *),
 593                         void *data);
 594 extern void blk_unregister_region(dev_t devt, unsigned long range);
 595
 596 static inline struct block_device *bdget_disk(struct gendisk *disk, int index)
 597 {
 598         return bdget(MKDEV(disk->major, disk->first_minor) + index);
 599 }
 600
 601 <<<<<<< HEAD:include/linux/genhd.h
 602 #endif
 603
 604 =======
 605 >>>>>>> 264e3e889d86e552b4191d69bb60f4f3b383135a:include/linux/genhd.h
 606 #else /* CONFIG_BLOCK */
 607
 608 static inline void printk_all_partitions(void) { }
 609
 610 static inline dev_t blk_lookup_devt(const char *name)
 611 {
 612         dev_t devt = MKDEV(0, 0);
 613         return devt;
 614 }
 615
 616 #endif /* CONFIG_BLOCK */
 617
 618 <<<<<<< HEAD:include/linux/genhd.h
 619 #endif
 620 =======
 621 #endif /* _LINUX_GENHD_H */
 622 >>>>>>> 264e3e889d86e552b4191d69bb60f4f3b383135a:include/linux/genhd.h