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

Commit b8020eff authored by Andreas Gruenbacher's avatar Andreas Gruenbacher Committed by Al Viro
Browse files

hfs: Switch to generic xattr handlers 



Signed-off-by: default avatarAndreas Gruenbacher <agruenba@redhat.com>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 6966f842

fs/hfs/attr.c

+57 −26
Original line number Diff line number Diff line
@@ -13,9 +13,13 @@ 
#include "hfs_fs.h"

#include "btree.h"



int hfs_setxattr(struct dentry *unused, struct inode *inode,

		 const char *name, const void *value,

		 size_t size, int flags)

enum hfs_xattr_type {

	HFS_TYPE,

	HFS_CREATOR,

};



static int __hfs_setxattr(struct inode *inode, enum hfs_xattr_type type,

			  const void *value, size_t size, int flags)

{

	struct hfs_find_data fd;

	hfs_cat_rec rec;
@@ -36,18 +40,22 @@ int hfs_setxattr(struct dentry *unused, struct inode *inode, 
			sizeof(struct hfs_cat_file));

	file = &rec.file;



	if (!strcmp(name, "hfs.type")) {

	switch (type) {

	case HFS_TYPE:

		if (size == 4)

			memcpy(&file->UsrWds.fdType, value, 4);

		else

			res = -ERANGE;

	} else if (!strcmp(name, "hfs.creator")) {

		break;



	case HFS_CREATOR:

		if (size == 4)

			memcpy(&file->UsrWds.fdCreator, value, 4);

		else

			res = -ERANGE;

	} else

		res = -EOPNOTSUPP;

		break;

	}



	if (!res)

		hfs_bnode_write(fd.bnode, &rec, fd.entryoffset,

				sizeof(struct hfs_cat_file));
@@ -56,8 +64,8 @@ int hfs_setxattr(struct dentry *unused, struct inode *inode, 
	return res;

}



ssize_t hfs_getxattr(struct dentry *unused, struct inode *inode,

		     const char *name, void *value, size_t size)

static ssize_t __hfs_getxattr(struct inode *inode, enum hfs_xattr_type type,

			      void *value, size_t size)

{

	struct hfs_find_data fd;

	hfs_cat_rec rec;
@@ -80,41 +88,64 @@ ssize_t hfs_getxattr(struct dentry *unused, struct inode *inode, 
	}

	file = &rec.file;



	if (!strcmp(name, "hfs.type")) {

	switch (type) {

	case HFS_TYPE:

		if (size >= 4) {

			memcpy(value, &file->UsrWds.fdType, 4);

			res = 4;

		} else

			res = size ? -ERANGE : 4;

	} else if (!strcmp(name, "hfs.creator")) {

		break;



	case HFS_CREATOR:

		if (size >= 4) {

			memcpy(value, &file->UsrWds.fdCreator, 4);

			res = 4;

		} else

			res = size ? -ERANGE : 4;

	} else

		res = -ENODATA;

		break;

	}



out:

	if (size)

		hfs_find_exit(&fd);

	return res;

}



#define HFS_ATTRLIST_SIZE (sizeof("hfs.creator")+sizeof("hfs.type"))



ssize_t hfs_listxattr(struct dentry *dentry, char *buffer, size_t size)

static int hfs_xattr_get(const struct xattr_handler *handler,

			 struct dentry *unused, struct inode *inode,

			 const char *name, void *value, size_t size)

{

	struct inode *inode = d_inode(dentry);

	return __hfs_getxattr(inode, handler->flags, value, size);

}



	if (!S_ISREG(inode->i_mode) || HFS_IS_RSRC(inode))

static int hfs_xattr_set(const struct xattr_handler *handler,

			 struct dentry *unused, struct inode *inode,

			 const char *name, const void *value, size_t size,

			 int flags)

{

	if (!value)

		return -EOPNOTSUPP;



	if (!buffer || !size)

		return HFS_ATTRLIST_SIZE;

	if (size < HFS_ATTRLIST_SIZE)

		return -ERANGE;

	strcpy(buffer, "hfs.type");

	strcpy(buffer + sizeof("hfs.type"), "hfs.creator");



	return HFS_ATTRLIST_SIZE;

	return __hfs_setxattr(inode, handler->flags, value, size, flags);

}



static const struct xattr_handler hfs_creator_handler = {

	.name = "hfs.creator",

	.flags = HFS_CREATOR,

	.get = hfs_xattr_get,

	.set = hfs_xattr_set,

};



static const struct xattr_handler hfs_type_handler = {

	.name = "hfs.type",

	.flags = HFS_TYPE,

	.get = hfs_xattr_get,

	.set = hfs_xattr_set,

};



const struct xattr_handler *hfs_xattr_handlers[] = {

	&hfs_creator_handler,

	&hfs_type_handler,

	NULL

};

fs/hfs/hfs_fs.h

+1 −5
Original line number Diff line number Diff line
@@ -212,11 +212,7 @@ extern void hfs_evict_inode(struct inode *); 
extern void hfs_delete_inode(struct inode *);



/* attr.c */

extern int hfs_setxattr(struct dentry *dentry, struct inode *inode, const char *name,

			const void *value, size_t size, int flags);

extern ssize_t hfs_getxattr(struct dentry *dentry, struct inode *inode,

			    const char *name, void *value, size_t size);

extern ssize_t hfs_listxattr(struct dentry *dentry, char *buffer, size_t size);

extern const struct xattr_handler *hfs_xattr_handlers[];



/* mdb.c */

extern int hfs_mdb_get(struct super_block *);

fs/hfs/inode.c

+4 −3
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <linux/mpage.h>

#include <linux/sched.h>

#include <linux/uio.h>

#include <linux/xattr.h>



#include "hfs_fs.h"

#include "btree.h"
@@ -687,7 +688,7 @@ static const struct file_operations hfs_file_operations = { 
static const struct inode_operations hfs_file_inode_operations = {

	.lookup		= hfs_file_lookup,

	.setattr	= hfs_inode_setattr,

	.setxattr	= hfs_setxattr,

	.getxattr	= hfs_getxattr,

	.listxattr	= hfs_listxattr,

	.setxattr	= generic_setxattr,

	.getxattr	= generic_getxattr,

	.listxattr	= generic_listxattr,

};

fs/hfs/super.c

+1 −0
Original line number Diff line number Diff line
@@ -406,6 +406,7 @@ static int hfs_fill_super(struct super_block *sb, void *data, int silent) 
	}



	sb->s_op = &hfs_super_operations;

	sb->s_xattr = hfs_xattr_handlers;

	sb->s_flags |= MS_NODIRATIME;

	mutex_init(&sbi->bitmap_lock);