[in viro/vfs.git #fixes at the moment; if you want to put it through your
tree, just say so]

On all failure exits that go to error_out there we have already moved the
nls reference from uopt->nls_map to sbi->s_nls_map, leaving NULL behind.
    
Fixes: c4e89cc674ac ("udf: convert to new mount API")
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
diff --git a/fs/udf/super.c b/fs/udf/super.c
index b2f168b0a0d1..97a51c64ad48 100644
--- a/fs/udf/super.c
+++ b/fs/udf/super.c
@@ -2320,7 +2320,7 @@ static int udf_fill_super(struct super_block *sb, struct fs_context *fc)
 
 error_out:
 	iput(sbi->s_vat_inode);
-	unload_nls(uopt->nls_map);
+	unload_nls(sbi->s_nls_map);
 	if (lvid_open)
 		udf_close_lvid(sb);
 	brelse(sbi->s_lvid_bh);