[PATCH] md/raid5-cache: no recovery is required when create super-block

[PATCH] md/raid5-cache: no recovery is required when create super-block

[JackieLiu]

When create the super-block information, We do not need to do this
recovery stage, only need to initialize some variables.
---
 drivers/md/raid5-cache.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/drivers/md/raid5-cache.c b/drivers/md/raid5-cache.c
index c3b3124..96f25df 100644
--- a/drivers/md/raid5-cache.c
+++ b/drivers/md/raid5-cache.c
@@ -2545,7 +2545,13 @@ static int r5l_load_log(struct r5l_log *log)
 
 	__free_page(page);
 
-	ret = r5l_recovery_log(log);
+	if (create_super) {
+		log->log_start = r5l_ring_add(log, cp, BLOCK_SECTORS);
+		log->seq = log->last_cp_seq + 1;
+		log->next_checkpoint = cp;
+	} else
+		ret = r5l_recovery_log(log);
+
 	r5c_update_log_state(log);
 	return ret;
 ioerr:
-- 
2.10.2

Re: [PATCH] md/raid5-cache: no recovery is required when create super-block

[Shaohua Li]

On Tue, Dec 06, 2016 at 02:13:17PM +0800, JackieLiu wrote:
> When create the super-block information, We do not need to do this
> recovery stage, only need to initialize some variables.

This makes sense.

please do look at Documentation/SubmittingPatches. I can't apply patch without
'signed-off-by'.

> ---
>  drivers/md/raid5-cache.c | 8 +++++++-
>  1 file changed, 7 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/md/raid5-cache.c b/drivers/md/raid5-cache.c
> index c3b3124..96f25df 100644
> --- a/drivers/md/raid5-cache.c
> +++ b/drivers/md/raid5-cache.c
> @@ -2545,7 +2545,13 @@ static int r5l_load_log(struct r5l_log *log)
>  
>  	__free_page(page);
>  
> -	ret = r5l_recovery_log(log);
> +	if (create_super) {
> +		log->log_start = r5l_ring_add(log, cp, BLOCK_SECTORS);
> +		log->seq = log->last_cp_seq + 1;
> +		log->next_checkpoint = cp;

must set ret = 0 here. Next time please make sure there isn't compiling
warnning.

Thanks,
Shaohua

[PATCH] md/raid5-cache: no recovery is required when create super-block

[JackieLiu]

When create the super-block information, We do not need to do this
recovery stage, only need to initialize some variables.

Signed-off-by: JackieLiu <liuyun01@kylinos.cn>
---
 drivers/md/raid5-cache.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/drivers/md/raid5-cache.c b/drivers/md/raid5-cache.c
index c3b3124..7c732c5 100644
--- a/drivers/md/raid5-cache.c
+++ b/drivers/md/raid5-cache.c
@@ -2492,7 +2492,7 @@ static int r5l_load_log(struct r5l_log *log)
 	sector_t cp = log->rdev->journal_tail;
 	u32 stored_crc, expected_crc;
 	bool create_super = false;
-	int ret;
+	int ret = 0;
 
 	/* Make sure it's valid */
 	if (cp >= rdev->sectors || round_down(cp, BLOCK_SECTORS) != cp)
@@ -2545,7 +2545,13 @@ static int r5l_load_log(struct r5l_log *log)
 
 	__free_page(page);
 
-	ret = r5l_recovery_log(log);
+	if (create_super) {
+		log->log_start = r5l_ring_add(log, cp, BLOCK_SECTORS);
+		log->seq = log->last_cp_seq + 1;
+		log->next_checkpoint = cp;
+	} else
+		ret = r5l_recovery_log(log);
+
 	r5c_update_log_state(log);
 	return ret;
 ioerr:
-- 
2.10.2

Re: [PATCH] md/raid5-cache: no recovery is required when create super-block

[Shaohua Li]

On Thu, Dec 08, 2016 at 08:47:39AM +0800, JackieLiu wrote:
> When create the super-block information, We do not need to do this
> recovery stage, only need to initialize some variables.

applied, thanks!
 
> Signed-off-by: JackieLiu <liuyun01@kylinos.cn>
> ---
>  drivers/md/raid5-cache.c | 10 ++++++++--
>  1 file changed, 8 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/md/raid5-cache.c b/drivers/md/raid5-cache.c
> index c3b3124..7c732c5 100644
> --- a/drivers/md/raid5-cache.c
> +++ b/drivers/md/raid5-cache.c
> @@ -2492,7 +2492,7 @@ static int r5l_load_log(struct r5l_log *log)
>  	sector_t cp = log->rdev->journal_tail;
>  	u32 stored_crc, expected_crc;
>  	bool create_super = false;
> -	int ret;
> +	int ret = 0;
>  
>  	/* Make sure it's valid */
>  	if (cp >= rdev->sectors || round_down(cp, BLOCK_SECTORS) != cp)
> @@ -2545,7 +2545,13 @@ static int r5l_load_log(struct r5l_log *log)
>  
>  	__free_page(page);
>  
> -	ret = r5l_recovery_log(log);
> +	if (create_super) {
> +		log->log_start = r5l_ring_add(log, cp, BLOCK_SECTORS);
> +		log->seq = log->last_cp_seq + 1;
> +		log->next_checkpoint = cp;
> +	} else
> +		ret = r5l_recovery_log(log);
> +
>  	r5c_update_log_state(log);
>  	return ret;
>  ioerr:
> -- 
> 2.10.2
> 
> 
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-raid" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html