projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'sound-4.1-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...
[cascardo/linux.git]
/
fs
/
ext4
/
dir.c
diff --git
a/fs/ext4/dir.c
b/fs/ext4/dir.c
index
61db51a
..
5665d82
100644
(file)
--- a/
fs/ext4/dir.c
+++ b/
fs/ext4/dir.c
@@
-249,7
+249,7
@@
static int ext4_readdir(struct file *file, struct dir_context *ctx)
} else {
/* Directory is encrypted */
err = ext4_fname_disk_to_usr(enc_ctx,
-
de, &fname_crypto_str);
+
NULL,
de, &fname_crypto_str);
if (err < 0)
goto errout;
if (!dir_emit(ctx,