diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-17 19:16:12 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-17 19:16:12 -0800 |
| commit | 231753ef780012eb6f3922c3dfc0a7186baa33c2 (patch) | |
| tree | c580186402ac9c5d7392ba4516dd3c88588807ba /fs/btrfs | |
| 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 'fs/btrfs')
| -rw-r--r-- | fs/btrfs/inode.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index c3b6ffa8e39d..f2b281ad7af6 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -10653,7 +10653,6 @@ static const struct inode_operations btrfs_special_inode_operations = { .update_time = btrfs_update_time, }; static const struct inode_operations btrfs_symlink_inode_operations = { - .readlink = generic_readlink, .get_link = page_get_link, .getattr = btrfs_getattr, .setattr = btrfs_setattr, |