Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fbc12f45 authored by Andreas Gruenbacher's avatar Andreas Gruenbacher Committed by Philipp Reisner
Browse files

drbd: receive_protocol(): Make the program flow less confusing 



Signed-off-by: default avatarPhilipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: default avatarLars Ellenberg <lars.ellenberg@linbit.com>
parent b792c35c

drivers/block/drbd/drbd_receiver.c

+35 −38
Original line number Diff line number Diff line
@@ -3083,10 +3083,7 @@ static int receive_protocol(struct drbd_tconn *tconn, struct packet_info *pi) 


		synchronize_rcu();

		kfree(old_net_conf);



		return 0;

	}



	} else {

		clear_bit(CONN_DRY_RUN, &tconn->flags);



		if (cf & CF_DRY_RUN)
@@ -3131,7 +3128,7 @@ static int receive_protocol(struct drbd_tconn *tconn, struct packet_info *pi) 
		}



		rcu_read_unlock();



	}

	return 0;



disconnect_rcu_unlock: