Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drbd: Constants should be UPPERCASE

Signed-off-by: Andreas Gruenbacher <agruen@linbit.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

authored by

Philipp Reisner and committed by
Jens Axboe
e96c9633 28e448bb

+19 -14
+6 -1
drivers/block/drbd/drbd_int.h
··· 1467 1467 extern void drbd_resume_io(struct drbd_conf *mdev); 1468 1468 extern char *ppsize(char *buf, unsigned long long size); 1469 1469 extern sector_t drbd_new_dev_size(struct drbd_conf *, struct drbd_backing_dev *, sector_t, int); 1470 - enum determine_dev_size { dev_size_error = -1, unchanged = 0, shrunk = 1, grew = 2 }; 1470 + enum determine_dev_size { 1471 + DS_ERROR = -1, 1472 + DS_UNCHANGED = 0, 1473 + DS_SHRUNK = 1, 1474 + DS_GREW = 2 1475 + }; 1471 1476 extern enum determine_dev_size drbd_determine_dev_size(struct drbd_conf *, enum dds_flags) __must_hold(local); 1472 1477 extern void resync_after_online_grow(struct drbd_conf *); 1473 1478 extern void drbd_reconsider_max_bio_size(struct drbd_conf *mdev);
+10 -10
drivers/block/drbd/drbd_nl.c
··· 835 835 char ppb[10]; 836 836 837 837 int md_moved, la_size_changed; 838 - enum determine_dev_size rv = unchanged; 838 + enum determine_dev_size rv = DS_UNCHANGED; 839 839 840 840 /* race: 841 841 * application request passes inc_ap_bio, ··· 878 878 "Leaving size unchanged at size = %lu KB\n", 879 879 (unsigned long)size); 880 880 } 881 - rv = dev_size_error; 881 + rv = DS_ERROR; 882 882 } 883 883 /* racy, see comments above. */ 884 884 drbd_set_my_capacity(mdev, size); ··· 886 886 dev_info(DEV, "size = %s (%llu KB)\n", ppsize(ppb, size>>1), 887 887 (unsigned long long)size>>1); 888 888 } 889 - if (rv == dev_size_error) 889 + if (rv == DS_ERROR) 890 890 goto out; 891 891 892 892 la_size_changed = (la_size_sect != mdev->ldev->md.la_size_sect); ··· 905 905 err = drbd_bitmap_io(mdev, md_moved ? &drbd_bm_write_all : &drbd_bm_write, 906 906 "size changed", BM_LOCKED_MASK); 907 907 if (err) { 908 - rv = dev_size_error; 908 + rv = DS_ERROR; 909 909 goto out; 910 910 } 911 911 drbd_md_mark_dirty(mdev); 912 912 } 913 913 914 914 if (size > la_size_sect) 915 - rv = grew; 915 + rv = DS_GREW; 916 916 if (size < la_size_sect) 917 - rv = shrunk; 917 + rv = DS_SHRUNK; 918 918 out: 919 919 lc_unlock(mdev->act_log); 920 920 wake_up(&mdev->al_wait); ··· 1619 1619 set_bit(USE_DEGR_WFC_T, &mdev->flags); 1620 1620 1621 1621 dd = drbd_determine_dev_size(mdev, 0); 1622 - if (dd == dev_size_error) { 1622 + if (dd == DS_ERROR) { 1623 1623 retcode = ERR_NOMEM_BITMAP; 1624 1624 goto force_diskless_dec; 1625 - } else if (dd == grew) 1625 + } else if (dd == DS_GREW) 1626 1626 set_bit(RESYNC_AFTER_NEG, &mdev->flags); 1627 1627 1628 1628 if (drbd_md_test_flag(mdev->ldev, MDF_FULL_SYNC) || ··· 2387 2387 dd = drbd_determine_dev_size(mdev, ddsf); 2388 2388 drbd_md_sync(mdev); 2389 2389 put_ldev(mdev); 2390 - if (dd == dev_size_error) { 2390 + if (dd == DS_ERROR) { 2391 2391 retcode = ERR_NOMEM_BITMAP; 2392 2392 goto fail; 2393 2393 } 2394 2394 2395 2395 if (mdev->state.conn == C_CONNECTED) { 2396 - if (dd == grew) 2396 + if (dd == DS_GREW) 2397 2397 set_bit(RESIZE_PENDING, &mdev->flags); 2398 2398 2399 2399 drbd_send_uuids(mdev);
+3 -3
drivers/block/drbd/drbd_receiver.c
··· 3545 3545 { 3546 3546 struct drbd_conf *mdev; 3547 3547 struct p_sizes *p = pi->data; 3548 - enum determine_dev_size dd = unchanged; 3548 + enum determine_dev_size dd = DS_UNCHANGED; 3549 3549 sector_t p_size, p_usize, my_usize; 3550 3550 int ldsc = 0; /* local disk size changed */ 3551 3551 enum dds_flags ddsf; ··· 3619 3619 if (get_ldev(mdev)) { 3620 3620 dd = drbd_determine_dev_size(mdev, ddsf); 3621 3621 put_ldev(mdev); 3622 - if (dd == dev_size_error) 3622 + if (dd == DS_ERROR) 3623 3623 return -EIO; 3624 3624 drbd_md_sync(mdev); 3625 3625 } else { ··· 3647 3647 drbd_send_sizes(mdev, 0, ddsf); 3648 3648 } 3649 3649 if (test_and_clear_bit(RESIZE_PENDING, &mdev->flags) || 3650 - (dd == grew && mdev->state.conn == C_CONNECTED)) { 3650 + (dd == DS_GREW && mdev->state.conn == C_CONNECTED)) { 3651 3651 if (mdev->state.pdsk >= D_INCONSISTENT && 3652 3652 mdev->state.disk >= D_INCONSISTENT) { 3653 3653 if (ddsf & DDSF_NO_RESYNC)