diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-13 23:59:55 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-13 23:59:55 +0200 |
| commit | 29c079caf584ad9a333c0d32292d036d1ae3205f (patch) | |
| tree | a31d90dd4abc210855cc5305458b2815359dd464 /fs/udf/super.c | |
| parent | Merge tag 'iommu-updates-v5.2' of ssh://gitolite.kernel.org/pub/scm/linux/ker... (diff) | |
| parent | quota: check time limit when back out space/inode change (diff) | |
| download | linux-29c079caf584ad9a333c0d32292d036d1ae3205f.tar.xz linux-29c079caf584ad9a333c0d32292d036d1ae3205f.zip | |
Merge tag 'fs_for_v5.2-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
Pull misc filesystem updates from Jan Kara:
"A couple of small bugfixes and cleanups for quota, udf, ext2, and
reiserfs"
* tag 'fs_for_v5.2-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
quota: check time limit when back out space/inode change
fs/quota: erase unused but set variable warning
quota: fix wrong indentation
udf: fix an uninitialized read bug and remove dead code
fs/reiserfs/journal.c: Make remove_journal_hash static
quota: remove trailing whitespaces
quota: code cleanup for __dquot_alloc_space()
ext2: Adjust the comment of function ext2_alloc_branch
udf: Explain handling of load_nls() failure
Diffstat (limited to 'fs/udf/super.c')
| -rw-r--r-- | fs/udf/super.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/fs/udf/super.c b/fs/udf/super.c index f64691f2168a..a14346137361 100644 --- a/fs/udf/super.c +++ b/fs/udf/super.c @@ -566,6 +566,11 @@ static int udf_parse_options(char *options, struct udf_options *uopt, if (!remount) { if (uopt->nls_map) unload_nls(uopt->nls_map); + /* + * load_nls() failure is handled later in + * udf_fill_super() after all options are + * parsed. + */ uopt->nls_map = load_nls(args[0].from); uopt->flags |= (1 << UDF_FLAG_NLS_MAP); } |