sysv: switch to simple_follow_link()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
parent
0f301bd305
commit
2e03f3ea7a
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -1,20 +0,0 @@
|
|||
/*
|
||||
* 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,
|
||||
};
|
|
@ -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;
|
||||
|
|
Loading…
Reference in New Issue