diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-03 18:23:53 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-03 18:23:53 -0700 |
| commit | 8663da2c0919896788321cd8a0016af08588c656 (patch) | |
| tree | 9e92edcab3fa5187f8af2b02cdc791453b21c8b8 /fs/ext4/symlink.c | |
| parent | 101a6fd387801bbe164eafea3950b98f8e6440bb (diff) | |
| parent | 2c869b262a10ca99cb866d04087d75311587a30c (diff) | |
| download | linux-8663da2c0919896788321cd8a0016af08588c656.tar.gz | |
Merge tag 'for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
Pull ext4 fixes from Ted Ts'o:
"Some miscellaneous bug fixes and some final on-disk and ABI changes
for ext4 encryption which provide better security and performance"
* tag 'for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
ext4: fix growing of tiny filesystems
ext4: move check under lock scope to close a race.
ext4: fix data corruption caused by unwritten and delayed extents
ext4 crypto: remove duplicated encryption mode definitions
ext4 crypto: do not select from EXT4_FS_ENCRYPTION
ext4 crypto: add padding to filenames before encrypting
ext4 crypto: simplify and speed up filename encryption
Diffstat (limited to 'fs/ext4/symlink.c')
| -rw-r--r-- | fs/ext4/symlink.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext4/symlink.c b/fs/ext4/symlink.c index 19f78f20975ea..187b789203142 100644 --- a/fs/ext4/symlink.c +++ b/fs/ext4/symlink.c @@ -74,7 +74,7 @@ static void *ext4_follow_link(struct dentry *dentry, struct nameidata *nd) goto errout; } pstr.name = paddr; - res = _ext4_fname_disk_to_usr(ctx, &cstr, &pstr); + res = _ext4_fname_disk_to_usr(ctx, NULL, &cstr, &pstr); if (res < 0) goto errout; /* Null-terminate the name */ |