Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6

[safe/jmp/linux-2.6] / include / linux / genhd.h

diff --git a/include/linux/genhd.h b/include/linux/genhd.h
index 524ec96..be4f5e5 100644 (file)
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
@@ -110,7 +110,6 @@ struct hd_struct {
 #define GENHD_FL_SUPPRESS_PARTITION_INFO       32
 #define GENHD_FL_FAIL                          64
 
-
 struct gendisk {
        int major;                      /* major number of driver */
        int first_minor;
@@ -532,7 +531,7 @@ extern dev_t blk_lookup_devt(const char *name, int part);
 extern char *disk_name (struct gendisk *hd, int part, char *buf);
 
 extern int rescan_partitions(struct gendisk *disk, struct block_device *bdev);
-extern void add_partition(struct gendisk *, int, sector_t, sector_t, int);
+extern int __must_check add_partition(struct gendisk *, int, sector_t, sector_t, int);
 extern void delete_partition(struct gendisk *, int);
 extern void printk_all_partitions(void);