[Cluster-devel] [PATCH] gfs2: fix sprintf format specifier

[Cluster-devel] [PATCH] gfs2: fix sprintf format specifier

[alex chen]

Sprintf format specifier "%d" and "%u" are mixed up in
gfs2_recovery_done() and freeze_show(). So correct them.

Signed-off-by: Alex Chen <alex.chen@huawei.com>
Reviewed-by: Joseph Qi <joseph.qi@huawei.com>
---
 fs/gfs2/recovery.c | 2 +-
 fs/gfs2/sys.c      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/gfs2/recovery.c b/fs/gfs2/recovery.c
index 573bd3b..1b64577 100644
--- a/fs/gfs2/recovery.c
+++ b/fs/gfs2/recovery.c
@@ -439,7 +439,7 @@ static void gfs2_recovery_done(struct gfs2_sbd *sdp, unsigned int jid,

         ls->ls_recover_jid_done = jid;
         ls->ls_recover_jid_status = message;
-	sprintf(env_jid, "JID=%d", jid);
+	sprintf(env_jid, "JID=%u", jid);
 	sprintf(env_status, "RECOVERY=%s",
 		message == LM_RD_SUCCESS ? "Done" : "Failed");
         kobject_uevent_env(&sdp->sd_kobj, KOBJ_CHANGE, envp);
diff --git a/fs/gfs2/sys.c b/fs/gfs2/sys.c
index 3ab566b..ae8e881 100644
--- a/fs/gfs2/sys.c
+++ b/fs/gfs2/sys.c
@@ -96,7 +96,7 @@ static ssize_t freeze_show(struct gfs2_sbd *sdp, char *buf)
 	struct super_block *sb = sdp->sd_vfs;
 	int frozen = (sb->s_writers.frozen == SB_UNFROZEN) ? 0 : 1;

-	return snprintf(buf, PAGE_SIZE, "%u\n", frozen);
+	return snprintf(buf, PAGE_SIZE, "%d\n", frozen);
 }

 static ssize_t freeze_store(struct gfs2_sbd *sdp, const char *buf, size_t len)
-- 
1.8.4.3

[Cluster-devel] [PATCH] gfs2: fix sprintf format specifier

[Steven Whitehouse]

Hi,

On 12/01/15 11:01, alex chen wrote:
> Sprintf format specifier "%d" and "%u" are mixed up in
> gfs2_recovery_done() and freeze_show(). So correct them.
>
> Signed-off-by: Alex Chen <alex.chen@huawei.com>
> Reviewed-by: Joseph Qi <joseph.qi@huawei.com>

Now in the GFS2 -nmw tree. Thanks,

Steve.

> ---
>   fs/gfs2/recovery.c | 2 +-
>   fs/gfs2/sys.c      | 2 +-
>   2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/fs/gfs2/recovery.c b/fs/gfs2/recovery.c
> index 573bd3b..1b64577 100644
> --- a/fs/gfs2/recovery.c
> +++ b/fs/gfs2/recovery.c
> @@ -439,7 +439,7 @@ static void gfs2_recovery_done(struct gfs2_sbd *sdp, unsigned int jid,
>
>           ls->ls_recover_jid_done = jid;
>           ls->ls_recover_jid_status = message;
> -	sprintf(env_jid, "JID=%d", jid);
> +	sprintf(env_jid, "JID=%u", jid);
>   	sprintf(env_status, "RECOVERY=%s",
>   		message == LM_RD_SUCCESS ? "Done" : "Failed");
>           kobject_uevent_env(&sdp->sd_kobj, KOBJ_CHANGE, envp);
> diff --git a/fs/gfs2/sys.c b/fs/gfs2/sys.c
> index 3ab566b..ae8e881 100644
> --- a/fs/gfs2/sys.c
> +++ b/fs/gfs2/sys.c
> @@ -96,7 +96,7 @@ static ssize_t freeze_show(struct gfs2_sbd *sdp, char *buf)
>   	struct super_block *sb = sdp->sd_vfs;
>   	int frozen = (sb->s_writers.frozen == SB_UNFROZEN) ? 0 : 1;
>
> -	return snprintf(buf, PAGE_SIZE, "%u\n", frozen);
> +	return snprintf(buf, PAGE_SIZE, "%d\n", frozen);
>   }
>
>   static ssize_t freeze_store(struct gfs2_sbd *sdp, const char *buf, size_t len)