DRBD 8.0 return error when vmalloc fail
PATCH 1/1 DRBD 8.0 return error when vmalloc fail
Bitmap allocation failure is not visible for users. First reason is drbradm not return status of executed commands Second determin_dev_size() function return enum value which badly become non negative at function output from negative error code (at least for gcc3) . Attached patch is fix for these issues.
Stanislaw Gruszka
drbd/drbd_int.h +1 -1
@@ -1300,7 +1300,7 @@ extern int is_valid_ar_handle(drbd_request_t *, sector_t);// drbd_nl.c extern char *ppsize (char * buf,unsigned long long size);extern sector_t drbd_new_dev_size (struct Drbd_Conf *,struct drbd_backing_dev *); -enum determin_dev_size_enum { unchanged =0 , shrunk =1 , grew =2 }; +enum determin_dev_size_enum { dev_size_error =-1 , unchanged =0 , shrunk =1 , grew =2 };extern enum determin_dev_size_enum drbd_determin_dev_size (drbd_dev *);extern void resync_after_online_grow (drbd_dev *mdev);extern void drbd_setup_queue_param (drbd_dev *mdev,unsigned int );
drbd/drbd_nl.c +6 -6
@@ -461,7 +461,7 @@ enum determin_dev_size_enum drbd_determin_dev_size(drbd_dev* mdev)char ppb[10 ];int md_moved, la_size_changed; -int rv=unchanged; +enum determin_dev_size_enum rv=unchanged;wait_event (mdev->al_wait,lc_try_lock (mdev->act_log));
@@ -490,7 +490,7 @@ enum determin_dev_size_enum drbd_determin_dev_size(drbd_dev* mdev)"Leaving size unchanged at size = %lu KB\n" , (unsigned long)size); } - rv = err; + rv = dev_size_error; }// racy, see comments above. drbd_set_my_capacity (mdev,size);
@@ -498,7 +498,7 @@ enum determin_dev_size_enum drbd_determin_dev_size(drbd_dev* mdev)INFO ("size = %s (%llu KB)\n" ,ppsize (ppb,size>>1 ), (unsigned long long )size>>1 ); } -if (rv <0 ) goto out; +if (rv == dev_size_error) goto out; la_size_changed = (la_size != mdev->bc->md.la_size_sect);
@@ -931,7 +931,7 @@ STATIC int drbd_nl_disk_conf(drbd_dev *mdev, struct drbd_nl_cfg_req *nlp, }drbd_bm_lock (mdev);// racy... -if (drbd_determin_dev_size (mdev) <0 ) { +if (drbd_determin_dev_size (mdev) == dev_size_error) { retcode = VMallocFailed; goto unlock_bm; }
@@ -1309,7 +1309,7 @@ STATIC int drbd_nl_resize(drbd_dev *mdev, struct drbd_nl_cfg_req *nlp,struct resize rs;int retcode=NoError;int ldsc =0 ;/* local disk size changed */ -int dd; +enum determin_dev_size_enum dd;memset (&rs,0 ,sizeof (struct resize ));if (!resize_from_tags (mdev,nlp->tag_list,&rs)) {
@@ -1344,7 +1344,7 @@ STATIC int drbd_nl_resize(drbd_dev *mdev, struct drbd_nl_cfg_req *nlp,drbd_md_sync (mdev);drbd_bm_unlock (mdev);dec_local (mdev); -if (dd <0 ) { +if (dd == dev_size_error) { retcode = VMallocFailed; goto fail; }
drbd/drbd_receiver.c +2 -2
@@ -2238,7 +2238,6 @@ STATIC int receive_sizes(drbd_dev *mdev, Drbd_Header *h)sector_t p_size, p_usize, my_usize;int ldsc =0 ;/* local disk size changed */ drbd_conns_t nconn; -int dd; ERR_IF(h->length != (sizeof(*p)-sizeof(*h))) return FALSE;if (drbd_recv (mdev, h->payload, h->length) != h->length)
@@ -2293,11 +2292,12 @@ STATIC int receive_sizes(drbd_dev *mdev, Drbd_Header *h) mdev->p_size=p_size;if (inc_local (mdev)) { +enum determin_dev_size_enum dd;drbd_bm_lock (mdev);// { dd =drbd_determin_dev_size (mdev);drbd_bm_unlock (mdev);// } dec_local (mdev); -if (dd <0 )return FALSE; +if (dd == dev_size_error)return FALSE;if (dd == grew && mdev->state.conn == Connected && mdev->state.pdsk >= Inconsistent && mdev->state.disk >= Inconsistent) {
user/drbdadm_main.c +1 -1
@@ -1938,7 +1938,7 @@ int main(int argc, char** argv) } } -run_dcmds (); + rv =run_dcmds ();free_config (config);