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

Commit a2972846 authored by Andreas Gruenbacher's avatar Andreas Gruenbacher Committed by Jens Axboe
Browse files

drbd: Backport the "events2" command 



The events2 command originates from drbd-9 development. It features
more information but requires a incompatible change in output
format.
Therefore the previous events command continues to exist, the new
improved events2 command becomes available now.

This prepares the user-base for a later switch to the complete
drbd9 code base.

Signed-off-by: default avatarPhilipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: default avatarLars Ellenberg <lars.ellenberg@linbit.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 28bc3b8c

drivers/block/drbd/drbd_int.h

+45 −0
Original line number Diff line number Diff line
@@ -667,6 +667,8 @@ enum { 
	DEVICE_WORK_PENDING,	/* tell worker that some device has pending work */

};



enum which_state { NOW, OLD = NOW, NEW };



struct drbd_resource {

	char *name;

#ifdef CONFIG_DEBUG_FS
@@ -785,6 +787,17 @@ struct drbd_connection { 
	} send;

};



static inline bool has_net_conf(struct drbd_connection *connection)

{

	bool has_net_conf;



	rcu_read_lock();

	has_net_conf = rcu_dereference(connection->net_conf);

	rcu_read_unlock();



	return has_net_conf;

}



void __update_timing_details(

		struct drbd_thread_timing_details *tdp,

		unsigned int *cb_nr,
@@ -1017,6 +1030,12 @@ static inline struct drbd_peer_device *first_peer_device(struct drbd_device *dev 
	return list_first_entry_or_null(&device->peer_devices, struct drbd_peer_device, peer_devices);

}



static inline struct drbd_peer_device *

conn_peer_device(struct drbd_connection *connection, int volume_number)

{

	return idr_find(&connection->peer_devices, volume_number);

}



#define for_each_resource(resource, _resources) \

	list_for_each_entry(resource, _resources, resources)
@@ -1451,6 +1470,9 @@ extern int is_valid_ar_handle(struct drbd_request *, sector_t); 




/* drbd_nl.c */



extern struct mutex notification_mutex;



extern void drbd_suspend_io(struct drbd_device *device);

extern void drbd_resume_io(struct drbd_device *device);

extern char *ppsize(char *buf, unsigned long long size);
@@ -1665,6 +1687,29 @@ struct sib_info { 
};

void drbd_bcast_event(struct drbd_device *device, const struct sib_info *sib);



extern void notify_resource_state(struct sk_buff *,

				  unsigned int,

				  struct drbd_resource *,

				  struct resource_info *,

				  enum drbd_notification_type);

extern void notify_device_state(struct sk_buff *,

				unsigned int,

				struct drbd_device *,

				struct device_info *,

				enum drbd_notification_type);

extern void notify_connection_state(struct sk_buff *,

				    unsigned int,

				    struct drbd_connection *,

				    struct connection_info *,

				    enum drbd_notification_type);

extern void notify_peer_device_state(struct sk_buff *,

				     unsigned int,

				     struct drbd_peer_device *,

				     struct peer_device_info *,

				     enum drbd_notification_type);

extern void notify_helper(enum drbd_notification_type, struct drbd_device *,

			  struct drbd_connection *, const char *, int);



/*

 * inline helper functions

 *************************/

drivers/block/drbd/drbd_nl.c

+622 −3

File changed.

Preview size limit exceeded, changes collapsed.

drivers/block/drbd/drbd_receiver.c

+0 −6

File changed.

Preview size limit exceeded, changes collapsed.

drivers/block/drbd/drbd_state.c

+421 −3

File changed.

Preview size limit exceeded, changes collapsed.

drivers/block/drbd/drbd_state_change.h

0 → 100644
+63 −0

File added.

Preview size limit exceeded, changes collapsed.