diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2015-05-02 10:13:58 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2015-05-10 22:18:23 -0400 |
| commit | 75e7566bea0c9b2a257441b66294be94863ef929 (patch) | |
| tree | 96df7c9aeb61071973455e8d52d9742634d3d6e8 /fs/ext4 | |
| parent | 115b4205120dd5347858837dcdc17de0750bddef (diff) | |
| download | linux-rpi-75e7566bea0c9b2a257441b66294be94863ef929.tar.gz linux-rpi-75e7566bea0c9b2a257441b66294be94863ef929.tar.bz2 linux-rpi-75e7566bea0c9b2a257441b66294be94863ef929.zip | |
ext4: switch to simple_follow_link()
for fast symlinks only, of course...
Reviewed-by: Jan Kara <jack@suse.cz>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/ext4')
| -rw-r--r-- | fs/ext4/inode.c | 1 | ||||
| -rw-r--r-- | fs/ext4/namei.c | 4 | ||||
| -rw-r--r-- | fs/ext4/symlink.c | 9 |
3 files changed, 5 insertions, 9 deletions
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 9f3baa25ec54..066fdd7a1e2c 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -4217,6 +4217,7 @@ struct inode *ext4_iget(struct super_block *sb, unsigned long ino) inode->i_op = &ext4_encrypted_symlink_inode_operations; ext4_set_aops(inode); } else if (ext4_inode_is_fast_symlink(inode)) { + inode->i_link = (char *)ei->i_data; inode->i_op = &ext4_fast_symlink_inode_operations; nd_terminate_link(ei->i_data, inode->i_size, sizeof(ei->i_data) - 1); diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c index 39f8e6502639..5fdb9f6aa869 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c @@ -3251,8 +3251,10 @@ static int ext4_symlink(struct inode *dir, } else { /* clear the extent format for fast symlink */ ext4_clear_inode_flag(inode, EXT4_INODE_EXTENTS); - if (!encryption_required) + if (!encryption_required) { inode->i_op = &ext4_fast_symlink_inode_operations; + inode->i_link = (char *)&EXT4_I(inode)->i_data; + } memcpy((char *)&EXT4_I(inode)->i_data, disk_link.name, disk_link.len); inode->i_size = disk_link.len - 1; diff --git a/fs/ext4/symlink.c b/fs/ext4/symlink.c index 49575ff7a7bb..4264fb1e341a 100644 --- a/fs/ext4/symlink.c +++ b/fs/ext4/symlink.c @@ -106,13 +106,6 @@ const struct inode_operations ext4_encrypted_symlink_inode_operations = { }; #endif -static void *ext4_follow_fast_link(struct dentry *dentry, struct nameidata *nd) -{ - struct ext4_inode_info *ei = EXT4_I(d_inode(dentry)); - nd_set_link(nd, (char *) ei->i_data); - return NULL; -} - const struct inode_operations ext4_symlink_inode_operations = { .readlink = generic_readlink, .follow_link = page_follow_link_light, @@ -126,7 +119,7 @@ const struct inode_operations ext4_symlink_inode_operations = { const struct inode_operations ext4_fast_symlink_inode_operations = { .readlink = generic_readlink, - .follow_link = ext4_follow_fast_link, + .follow_link = simple_follow_link, .setattr = ext4_setattr, .setxattr = generic_setxattr, .getxattr = generic_getxattr, |