diff options
| author | Linus Torvalds | 2016-12-17 19:16:12 -0800 |
|---|---|---|
| committer | Linus Torvalds | 2016-12-17 19:16:12 -0800 |
| commit | 231753ef780012eb6f3922c3dfc0a7186baa33c2 (patch) | |
| tree | c580186402ac9c5d7392ba4516dd3c88588807ba /mm | |
| parent | 0110c350c86d511be2130cb2a30dcbb76c4af750 (diff) | |
| parent | d16744ec8ad011793144bb932ce822cc0c1733cb (diff) | |
Merge uncontroversial parts of branch 'readlink' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs
Pull partial readlink cleanups from Miklos Szeredi.
This is the uncontroversial part of the readlink cleanup patch-set that
simplifies the default readlink handling.
Miklos and Al are still discussing the rest of the series.
* git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs:
vfs: make generic_readlink() static
vfs: remove ".readlink = generic_readlink" assignments
vfs: default to generic_readlink()
vfs: replace calling i_op->readlink with vfs_readlink()
proc/self: use generic_readlink
ecryptfs: use vfs_get_link()
bad_inode: add missing i_op initializers
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/shmem.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/mm/shmem.c b/mm/shmem.c index 54287d443806..b1b20dc63265 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -3212,7 +3212,6 @@ static ssize_t shmem_listxattr(struct dentry *dentry, char *buffer, size_t size) #endif /* CONFIG_TMPFS_XATTR */ static const struct inode_operations shmem_short_symlink_operations = { - .readlink = generic_readlink, .get_link = simple_get_link, #ifdef CONFIG_TMPFS_XATTR .listxattr = shmem_listxattr, @@ -3220,7 +3219,6 @@ static const struct inode_operations shmem_short_symlink_operations = { }; static const struct inode_operations shmem_symlink_inode_operations = { - .readlink = generic_readlink, .get_link = shmem_get_link, #ifdef CONFIG_TMPFS_XATTR .listxattr = shmem_listxattr, |