From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 18 Dec 2016 03:16:12 +0000 (-0800)
Subject: Merge uncontroversial parts of branch 'readlink' of git://git.kernel.org/pub/scm... 
X-Git-Tag: v4.14-rc1~1827
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=231753ef780012eb6f3922c3dfc0a7186baa33c2;p=platform%2Fkernel%2Flinux-rpi.git

Merge uncontroversial parts of branch 'readlink' of git://git./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
---

231753ef780012eb6f3922c3dfc0a7186baa33c2
diff --cc fs/ubifs/file.c
index aa0625f,a7eae18..b0d7837
--- a/fs/ubifs/file.c
+++ b/fs/ubifs/file.c
@@@ -1733,8 -1628,7 +1733,7 @@@ const struct inode_operations ubifs_fil
  };
  
  const struct inode_operations ubifs_symlink_inode_operations = {
- 	.readlink    = generic_readlink,
 -	.get_link    = simple_get_link,
 +	.get_link    = ubifs_get_link,
  	.setattr     = ubifs_setattr,
  	.getattr     = ubifs_getattr,
  	.listxattr   = ubifs_listxattr,