Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ext2: use simple_follow_link()

Browse source 
Reviewed-by: Jan Kara <jack@suse.cz>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2015-05-02 10:02:46 -04:00
parent 61ba64fc07
commit cbe0fa3858
3 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
fs/ext2/inode.c
View file

@ -1403,6 +1403,7 @@ struct inode *ext2_iget (struct super_block *sb, unsigned long ino)
inode->i_mapping->a_ops = &ext2_aops; inode->i_mapping->a_ops = &ext2_aops;
} else if (S_ISLNK(inode->i_mode)) { } else if (S_ISLNK(inode->i_mode)) {
if (ext2_inode_is_fast_symlink(inode)) { if (ext2_inode_is_fast_symlink(inode)) {
inode->i_link = (char *)ei->i_data;
inode->i_op = &ext2_fast_symlink_inode_operations; inode->i_op = &ext2_fast_symlink_inode_operations;
nd_terminate_link(ei->i_data, inode->i_size, nd_terminate_link(ei->i_data, inode->i_size,
sizeof(ei->i_data) - 1); sizeof(ei->i_data) - 1);

3
fs/ext2/namei.c
View file

@ -189,7 +189,8 @@ static int ext2_symlink (struct inode * dir, struct dentry * dentry,
} else { } else {
/* fast symlink */ /* fast symlink */
inode->i_op = &ext2_fast_symlink_inode_operations; inode->i_op = &ext2_fast_symlink_inode_operations;
memcpy((char*)(EXT2_I(inode)->i_data),symname,l); inode->i_link = (char*)EXT2_I(inode)->i_data;
memcpy(inode->i_link, symname, l);
inode->i_size = l-1; inode->i_size = l-1;
} }
mark_inode_dirty(inode); mark_inode_dirty(inode);

10
fs/ext2/symlink.c
View file

@ -19,14 +19,6 @@
#include "ext2.h" #include "ext2.h"
#include "xattr.h" #include "xattr.h"
#include <linux/namei.h>
static void *ext2_follow_link(struct dentry *dentry, struct nameidata *nd)
{
struct ext2_inode_info *ei = EXT2_I(d_inode(dentry));
nd_set_link(nd, (char *)ei->i_data);
return NULL;
}
const struct inode_operations ext2_symlink_inode_operations = { const struct inode_operations ext2_symlink_inode_operations = {
.readlink = generic_readlink, .readlink = generic_readlink,
@ -43,7 +35,7 @@ const struct inode_operations ext2_symlink_inode_operations = {
const struct inode_operations ext2_fast_symlink_inode_operations = { const struct inode_operations ext2_fast_symlink_inode_operations = {
.readlink = generic_readlink, .readlink = generic_readlink,
.follow_link = ext2_follow_link, .follow_link = simple_follow_link,
.setattr = ext2_setattr, .setattr = ext2_setattr,
#ifdef CONFIG_EXT2_FS_XATTR #ifdef CONFIG_EXT2_FS_XATTR
.setxattr = generic_setxattr, .setxattr = generic_setxattr,