Merge remote-tracking branch 'crypto/master'

[deliverable/linux.git] / mm / shmem.c

diff --git a/mm/shmem.c b/mm/shmem.c
index fd8b2b5741b141a7bc4457d93929c100d988a639..ac35ebd236621c940453c0501146a9bca8b8c07f 100644 (file)
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -3813,7 +3813,7 @@ static const struct inode_operations shmem_dir_inode_operations = {
        .mkdir          = shmem_mkdir,
        .rmdir          = shmem_rmdir,
        .mknod          = shmem_mknod,
-       .rename2        = shmem_rename2,
+       .rename         = shmem_rename2,
        .tmpfile        = shmem_tmpfile,
 #endif
 #ifdef CONFIG_TMPFS_XATTR