diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-18 04:16:12 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-18 04:16:12 +0100 |
| commit | 231753ef780012eb6f3922c3dfc0a7186baa33c2 (patch) | |
| tree | c580186402ac9c5d7392ba4516dd3c88588807ba /fs/fuse/dir.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir... (diff) | |
| parent | vfs: make generic_readlink() static (diff) | |
| download | linux-231753ef780012eb6f3922c3dfc0a7186baa33c2.tar.xz linux-231753ef780012eb6f3922c3dfc0a7186baa33c2.zip | |
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/fuse/dir.c')
| -rw-r--r-- | fs/fuse/dir.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c index 096f79997f75..1f7c732f32b0 100644 --- a/fs/fuse/dir.c +++ b/fs/fuse/dir.c @@ -1831,7 +1831,6 @@ static const struct inode_operations fuse_common_inode_operations = { static const struct inode_operations fuse_symlink_inode_operations = { .setattr = fuse_setattr, .get_link = fuse_get_link, - .readlink = generic_readlink, .getattr = fuse_getattr, .listxattr = fuse_listxattr, }; |