Commit 2e03f3ea authored by Al Viro's avatar Al Viro
Browse files

sysv: switch to simple_follow_link() 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 0f301bd3

fs/sysv/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -5,4 +5,4 @@ 
obj-$(CONFIG_SYSV_FS) += sysv.o



sysv-objs := ialloc.o balloc.o inode.o itree.o file.o dir.o \

	     namei.o super.o symlink.o
 
	     namei.o super.o

fs/sysv/inode.c

+3 −2
Original line number Diff line number Diff line
@@ -166,8 +166,9 @@ void sysv_set_inode(struct inode *inode, dev_t rdev) 
			inode->i_op = &sysv_symlink_inode_operations;

			inode->i_mapping->a_ops = &sysv_aops;

		} else {

			inode->i_op = &sysv_fast_symlink_inode_operations;

			nd_terminate_link(SYSV_I(inode)->i_data, inode->i_size,

			inode->i_op = &simple_symlink_inode_operations;

			inode->i_link = (char *)SYSV_I(inode)->i_data;

			nd_terminate_link(inode->i_link, inode->i_size,

				sizeof(SYSV_I(inode)->i_data) - 1);

		}

	} else

fs/sysv/symlink.c

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line 
/*

 *  linux/fs/sysv/symlink.c

 *

 *  Handling of System V filesystem fast symlinks extensions.

 *  Aug 2001, Christoph Hellwig (hch@infradead.org)

 */



#include "sysv.h"

#include <linux/namei.h>



static void *sysv_follow_link(struct dentry *dentry, struct nameidata *nd)

{

	nd_set_link(nd, (char *)SYSV_I(d_inode(dentry))->i_data);

	return NULL;

}



const struct inode_operations sysv_fast_symlink_inode_operations = {

	.readlink	= generic_readlink,

	.follow_link	= sysv_follow_link,

};

fs/sysv/sysv.h

+0 −1
Original line number Diff line number Diff line
@@ -161,7 +161,6 @@ extern ino_t sysv_inode_by_name(struct dentry *); 


extern const struct inode_operations sysv_file_inode_operations;

extern const struct inode_operations sysv_dir_inode_operations;

extern const struct inode_operations sysv_fast_symlink_inode_operations;

extern const struct file_operations sysv_file_operations;

extern const struct file_operations sysv_dir_operations;

extern const struct address_space_operations sysv_aops;