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/ubifs | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs (diff) | |
| parent | vfs: make generic_readlink() static (diff) | |
| download | wireguard-linux-231753ef780012eb6f3922c3dfc0a7186baa33c2.tar.xz wireguard-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/ubifs')
| -rw-r--r-- | fs/ubifs/file.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/ubifs/file.c b/fs/ubifs/file.c index aa0625f4f642..b0d783774c96 100644 --- a/fs/ubifs/file.c +++ b/fs/ubifs/file.c @@ -1733,7 +1733,6 @@ const struct inode_operations ubifs_file_inode_operations = { }; const struct inode_operations ubifs_symlink_inode_operations = { - .readlink = generic_readlink, .get_link = ubifs_get_link, .setattr = ubifs_setattr, .getattr = ubifs_getattr, |