diff options
| author | Dave Airlie <airlied@redhat.com> | 2016-05-09 13:49:56 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-05-09 13:49:56 +1000 |
| commit | bafb86f5bc3173479002555dea7f31d943b12332 (patch) | |
| tree | 6ec94c96460faf782cdb8781339560e13e0918b0 /fs/udf/super.c | |
| parent | ba391646d0d43aee3596b616113cce0f22dde627 (diff) | |
| parent | 44549e8f5eea4e0a41b487b63e616cb089922b99 (diff) | |
Merge tag 'v4.6-rc7' into drm-next
Merge this back as we've built up a fair few conflicts, and I have
some newer trees to pull in.
Diffstat (limited to 'fs/udf/super.c')
| -rw-r--r-- | fs/udf/super.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/udf/super.c b/fs/udf/super.c index fa92fe839fda..36661acaf33b 100644 --- a/fs/udf/super.c +++ b/fs/udf/super.c @@ -919,14 +919,14 @@ static int udf_load_pvoldesc(struct super_block *sb, sector_t block) #endif } - ret = udf_CS0toUTF8(outstr, 31, pvoldesc->volIdent, 32); + ret = udf_dstrCS0toUTF8(outstr, 31, pvoldesc->volIdent, 32); if (ret < 0) goto out_bh; strncpy(UDF_SB(sb)->s_volume_ident, outstr, ret); udf_debug("volIdent[] = '%s'\n", UDF_SB(sb)->s_volume_ident); - ret = udf_CS0toUTF8(outstr, 127, pvoldesc->volSetIdent, 128); + ret = udf_dstrCS0toUTF8(outstr, 127, pvoldesc->volSetIdent, 128); if (ret < 0) goto out_bh; |