projects / ipfire-2.x.git / blame
| Commit | Line | Data |
|---|---|---|
| 2cb7cef9 BS |
1 | Patch-mainline: 2.6.30 |
| 2 | References: 498402 | |
| 3 | Git: 1b57f132231593923cb4ab99943ddd777e8745bc Mon Sep 17 00:00:00 2001 | |
| 4 | From: NeilBrown <neilb@suse.de> | |
| 5 | Date: Thu, 18 Jun 2009 08:48:19 +1000 | |
| 6 | Subject: [PATCH] md: move assignment of ->utime so that it never gets skipped. | |
| 7 | ||
| 8 | Currently the assignment to utime gets skipped for 'external' | |
| 9 | metadata. So move it to the top of the function so that it | |
| 10 | always gets effected. | |
| 11 | This is of largely cosmetic interest. Nothing actually depends | |
| 12 | on ->utime being right for external arrays. | |
| 13 | "mdadm --monitor" does use it for 0.90 and 1.x arrays, but with | |
| 14 | mdadm-3.0, this is not important for external metadata. | |
| 15 | ||
| 16 | However the 3.0-pre mdadm in SLES11 does depend on this being correct. | |
| 17 | ||
| 18 | Signed-off-by: NeilBrown <neilb@suse.de> | |
| 19 | ||
| 20 | --- | |
| 21 | drivers/md/md.c | 2 +- | |
| 22 | 1 file changed, 1 insertion(+), 1 deletion(-) | |
| 23 | ||
| 24 | --- linux-2.6.27-SLE11_BRANCH.orig/drivers/md/md.c | |
| 25 | +++ linux-2.6.27-SLE11_BRANCH/drivers/md/md.c | |
| 26 | @@ -1758,6 +1758,7 @@ static void md_update_sb(mddev_t * mddev | |
| 27 | int sync_req; | |
| 28 | int nospares = 0; | |
| 29 | ||
| 30 | + mddev->utime = get_seconds(); | |
| 31 | if (mddev->external) | |
| 32 | return; | |
| 33 | repeat: | |
| 34 | @@ -1787,7 +1788,6 @@ repeat: | |
| 35 | nospares = 0; | |
| 36 | ||
| 37 | sync_req = mddev->in_sync; | |
| 38 | - mddev->utime = get_seconds(); | |
| 39 | ||
| 40 | /* If this is just a dirty<->clean transition, and the array is clean | |
| 41 | * and 'events' is odd, we can roll back to the previous clean state */ |