diff mbox

[04/17] afs: use generic_readlink

Message ID 1473708559-12714-5-git-send-email-mszeredi@redhat.com (mailing list archive)
State New, archived
Headers show

Commit Message

Miklos Szeredi Sept. 12, 2016, 7:29 p.m. UTC 
This will allow us to move the generic readlink logic into the VFS and get
rid of the readlink method.

AFS mountpoints seem to be special symlinks that can be read but not
followed.  So add IOP_NOFOLLOW to i_opflags and use page_get_link +
generic_readlink instead of page_readlink.

Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
Cc: David Howells <dhowells@redhat.com>
---
 fs/afs/inode.c | 2 ++
 fs/afs/mntpt.c | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)
diff mbox

Patch

diff --git a/fs/afs/inode.c b/fs/afs/inode.c
index 86cc7264c21c..56709b2c46e3 100644
--- a/fs/afs/inode.c
+++ b/fs/afs/inode.c
@@ -88,6 +88,8 @@  static int afs_inode_map_status(struct afs_vnode *vnode, struct key *key)
 			inode->i_mode	= S_IFDIR | vnode->status.mode;
 			inode->i_op	= &afs_mntpt_inode_operations;
 			inode->i_fop	= &afs_mntpt_file_operations;
+			/* Not a real symlink, don't follow */
+			inode->i_opflags |= IOP_NOFOLLOW;
 		}
 	}
 
diff --git a/fs/afs/mntpt.c b/fs/afs/mntpt.c
index 81dd075356b9..7d170de2ce1b 100644
--- a/fs/afs/mntpt.c
+++ b/fs/afs/mntpt.c
@@ -33,7 +33,8 @@  const struct file_operations afs_mntpt_file_operations = {
 
 const struct inode_operations afs_mntpt_inode_operations = {
 	.lookup		= afs_mntpt_lookup,
-	.readlink	= page_readlink,
+	.get_link	= page_get_link,
+	.readlink	= generic_readlink,
 	.getattr	= afs_getattr,
 };