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

Commit 895d9db2 authored by Subodh Nijsure's avatar Subodh Nijsure Committed by Richard Weinberger
Browse files

UBIFS: Add xattr support for symlinks 



Artem: rename the __ubifs_setxattr() functions to just 'setxattr()'.

Signed-off-by: default avatarSubodh Nijsure <snijsure@grid-net.com>
Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: default avatarBen Shelton <ben.shelton@ni.com>
Acked-by: default avatarTerry Wilcox <terry.wilcox@ni.com>
Acked-by: default avatarGratian Crisan <gratian.crisan@ni.com>
Signed-off-by: default avatarArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
parent ff1f48ee

fs/ubifs/file.c

+4 −0
Original line number Diff line number Diff line
@@ -1574,6 +1574,10 @@ const struct inode_operations ubifs_symlink_inode_operations = { 
	.follow_link = ubifs_follow_link,

	.setattr     = ubifs_setattr,

	.getattr     = ubifs_getattr,

	.setxattr    = ubifs_setxattr,

	.getxattr    = ubifs_getxattr,

	.listxattr   = ubifs_listxattr,

	.removexattr = ubifs_removexattr,

};



const struct file_operations ubifs_file_operations = {

fs/ubifs/xattr.c

+12 −5
Original line number Diff line number Diff line
@@ -293,18 +293,16 @@ static struct inode *iget_xattr(struct ubifs_info *c, ino_t inum) 
	return ERR_PTR(-EINVAL);

}



int ubifs_setxattr(struct dentry *dentry, const char *name,

		   const void *value, size_t size, int flags)

static int setxattr(struct inode *host, const char *name, const void *value,

		    size_t size, int flags)

{

	struct inode *inode, *host = dentry->d_inode;

	struct inode *inode;

	struct ubifs_info *c = host->i_sb->s_fs_info;

	struct qstr nm = QSTR_INIT(name, strlen(name));

	struct ubifs_dent_node *xent;

	union ubifs_key key;

	int err, type;



	dbg_gen("xattr '%s', host ino %lu ('%pd'), size %zd", name,

		host->i_ino, dentry, size);

	ubifs_assert(mutex_is_locked(&host->i_mutex));



	if (size > UBIFS_MAX_INO_DATA)
@@ -356,6 +354,15 @@ int ubifs_setxattr(struct dentry *dentry, const char *name, 
	return err;

}



int ubifs_setxattr(struct dentry *dentry, const char *name,

		   const void *value, size_t size, int flags)

{

	dbg_gen("xattr '%s', host ino %lu ('%pd'), size %zd",

		name, dentry->d_inode->i_ino, dentry, size);



	return setxattr(dentry->d_inode, name, value, size, flags);

}



ssize_t ubifs_getxattr(struct dentry *dentry, const char *name, void *buf,

		       size_t size)

{