diff --git a/[refs] b/[refs] index 64a72302ee5b..a9c9dc26aad8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2eec6c8102c62c540c637176271cfdb13d828d7b +refs/heads/master: f07c9a79f06cd33b1c9c2c4eacb60bafa7e3f310 diff --git a/trunk/fs/btrfs/super.c b/trunk/fs/btrfs/super.c index 2cd32175753d..46b26650415f 100644 --- a/trunk/fs/btrfs/super.c +++ b/trunk/fs/btrfs/super.c @@ -188,7 +188,8 @@ void btrfs_printk(struct btrfs_fs_info *fs_info, const char *fmt, ...) va_start(args, fmt); if (fmt[0] == '<' && isdigit(fmt[1]) && fmt[2] == '>') { - strncpy(lvl, fmt, 3); + memcpy(lvl, fmt, 3); + lvl[3] = '\0'; fmt += 3; type = logtypes[fmt[1] - '0']; } else