patch-2.4.0-test2 linux/include/linux/raid/md_k.h

Next file: linux/include/linux/raid/raid1.h
Previous file: linux/include/linux/raid/md.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.0-test1/linux/include/linux/raid/md_k.h linux/include/linux/raid/md_k.h
@@ -199,15 +199,16 @@
 	int				sb_dirty;
 	mdu_param_t			param;
 	int				ro;
-	unsigned long			curr_resync;
-	unsigned long			resync_start;
+	unsigned long			curr_resync;	/* blocks scheduled */
+	unsigned long			resync_mark;	/* a recent timestamp */
+	unsigned long			resync_mark_cnt;/* blocks written at resync_mark */
 	char				*name;
 	int				recovery_running;
 	struct semaphore		reconfig_sem;
 	struct semaphore		recovery_sem;
 	struct semaphore		resync_sem;
 
-	atomic_t			recovery_active;
+	atomic_t			recovery_active; /* blocks scheduled, but not written */
 	md_wait_queue_head_t		recovery_wait;
 
 	struct md_list_head		all_mddevs;
@@ -218,11 +219,9 @@
 {
 	char *name;
 	int (*make_request)(request_queue_t *q, mddev_t *mddev, int rw, struct buffer_head * bh);
-	void (*end_request)(struct buffer_head * bh, int uptodate);
 	int (*run)(mddev_t *mddev);
 	int (*stop)(mddev_t *mddev);
 	int (*status)(char *page, mddev_t *mddev);
-	int max_invalid_dev;
 	int (*error_handler)(mddev_t *mddev, kdev_t dev);
 
 /*
@@ -337,7 +336,8 @@
 typedef struct dev_name_s {
 	struct md_list_head list;
 	kdev_t dev;
-	char name [MAX_DISKNAME_LEN];
+	char namebuf [MAX_DISKNAME_LEN];
+	char *name;
 } dev_name_t;
 
 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)