Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c73119c5 authored by Al Viro's avatar Al Viro
Browse files

udf: don't duplicate page_symlink_inode_operations 



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

fs/udf/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -1540,7 +1540,7 @@ static int udf_read_inode(struct inode *inode, bool hidden_inode) 
		break;

	case ICBTAG_FILE_TYPE_SYMLINK:

		inode->i_data.a_ops = &udf_symlink_aops;

		inode->i_op = &udf_symlink_inode_operations;

		inode->i_op = &page_symlink_inode_operations;

		inode->i_mode = S_IFLNK | S_IRWXUGO;

		break;

	case ICBTAG_FILE_TYPE_MAIN:

fs/udf/namei.c

+1 −6
Original line number Diff line number Diff line
@@ -921,7 +921,7 @@ static int udf_symlink(struct inode *dir, struct dentry *dentry, 
	}



	inode->i_data.a_ops = &udf_symlink_aops;

	inode->i_op = &udf_symlink_inode_operations;

	inode->i_op = &page_symlink_inode_operations;



	if (iinfo->i_alloc_type != ICBTAG_FLAG_AD_IN_ICB) {

		struct kernel_lb_addr eloc;
@@ -1344,8 +1344,3 @@ const struct inode_operations udf_dir_inode_operations = { 
	.rename				= udf_rename,

	.tmpfile			= udf_tmpfile,

};
 
const struct inode_operations udf_symlink_inode_operations = {

	.readlink	= generic_readlink,

	.follow_link	= page_follow_link_light,

	.put_link	= page_put_link,

};

fs/udf/udfdecl.h

+0 −1
Original line number Diff line number Diff line
@@ -85,7 +85,6 @@ extern const struct inode_operations udf_dir_inode_operations; 
extern const struct file_operations udf_dir_operations;

extern const struct inode_operations udf_file_inode_operations;

extern const struct file_operations udf_file_operations;

extern const struct inode_operations udf_symlink_inode_operations;

extern const struct address_space_operations udf_aops;

extern const struct address_space_operations udf_adinicb_aops;

extern const struct address_space_operations udf_symlink_aops;