hfsplus: add support of manipulation by attributes file

[firefly-linux-kernel-4.4.55.git] / fs / hfsplus / ioctl.c

diff --git a/fs/hfsplus/ioctl.c b/fs/hfsplus/ioctl.c
index 09addc8615fa6603e28d2fa718e5a32c1762acbd..d3ff5cc317d7948c956194a6e63414206167237a 100644 (file)
--- a/fs/hfsplus/ioctl.c
+++ b/fs/hfsplus/ioctl.c
@@ -16,7 +16,6 @@
 #include <linux/fs.h>
 #include <linux/mount.h>
 #include <linux/sched.h>
-#include <linux/xattr.h>
 #include <asm/uaccess.h>
 #include "hfsplus_fs.h"
 
@@ -59,7 +58,7 @@ static int hfsplus_ioctl_bless(struct file *file, int __user *user_flags)
 
 static int hfsplus_ioctl_getflags(struct file *file, int __user *user_flags)
 {
-       struct inode *inode = file->f_path.dentry->d_inode;
+       struct inode *inode = file_inode(file);
        struct hfsplus_inode_info *hip = HFSPLUS_I(inode);
        unsigned int flags = 0;
 
@@ -75,7 +74,7 @@ static int hfsplus_ioctl_getflags(struct file *file, int __user *user_flags)
 
 static int hfsplus_ioctl_setflags(struct file *file, int __user *user_flags)
 {
-       struct inode *inode = file->f_path.dentry->d_inode;
+       struct inode *inode = file_inode(file);
        struct hfsplus_inode_info *hip = HFSPLUS_I(inode);
        unsigned int flags;
        int err = 0;
@@ -151,110 +150,3 @@ long hfsplus_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                return -ENOTTY;
        }
 }
-
-int hfsplus_setxattr(struct dentry *dentry, const char *name,
-                    const void *value, size_t size, int flags)
-{
-       struct inode *inode = dentry->d_inode;
-       struct hfs_find_data fd;
-       hfsplus_cat_entry entry;
-       struct hfsplus_cat_file *file;
-       int res;
-
-       if (!S_ISREG(inode->i_mode) || HFSPLUS_IS_RSRC(inode))
-               return -EOPNOTSUPP;
-
-       res = hfs_find_init(HFSPLUS_SB(inode->i_sb)->cat_tree, &fd);
-       if (res)
-               return res;
-       res = hfsplus_find_cat(inode->i_sb, inode->i_ino, &fd);
-       if (res)
-               goto out;
-       hfs_bnode_read(fd.bnode, &entry, fd.entryoffset,
-                       sizeof(struct hfsplus_cat_file));
-       file = &entry.file;
-
-       if (!strcmp(name, "hfs.type")) {
-               if (size == 4)
-                       memcpy(&file->user_info.fdType, value, 4);
-               else
-                       res = -ERANGE;
-       } else if (!strcmp(name, "hfs.creator")) {
-               if (size == 4)
-                       memcpy(&file->user_info.fdCreator, value, 4);
-               else
-                       res = -ERANGE;
-       } else
-               res = -EOPNOTSUPP;
-       if (!res) {
-               hfs_bnode_write(fd.bnode, &entry, fd.entryoffset,
-                               sizeof(struct hfsplus_cat_file));
-               hfsplus_mark_inode_dirty(inode, HFSPLUS_I_CAT_DIRTY);
-       }
-out:
-       hfs_find_exit(&fd);
-       return res;
-}
-
-ssize_t hfsplus_getxattr(struct dentry *dentry, const char *name,
-                        void *value, size_t size)
-{
-       struct inode *inode = dentry->d_inode;
-       struct hfs_find_data fd;
-       hfsplus_cat_entry entry;
-       struct hfsplus_cat_file *file;
-       ssize_t res = 0;
-
-       if (!S_ISREG(inode->i_mode) || HFSPLUS_IS_RSRC(inode))
-               return -EOPNOTSUPP;
-
-       if (size) {
-               res = hfs_find_init(HFSPLUS_SB(inode->i_sb)->cat_tree, &fd);
-               if (res)
-                       return res;
-               res = hfsplus_find_cat(inode->i_sb, inode->i_ino, &fd);
-               if (res)
-                       goto out;
-               hfs_bnode_read(fd.bnode, &entry, fd.entryoffset,
-                               sizeof(struct hfsplus_cat_file));
-       }
-       file = &entry.file;
-
-       if (!strcmp(name, "hfs.type")) {
-               if (size >= 4) {
-                       memcpy(value, &file->user_info.fdType, 4);
-                       res = 4;
-               } else
-                       res = size ? -ERANGE : 4;
-       } else if (!strcmp(name, "hfs.creator")) {
-               if (size >= 4) {
-                       memcpy(value, &file->user_info.fdCreator, 4);
-                       res = 4;
-               } else
-                       res = size ? -ERANGE : 4;
-       } else
-               res = -EOPNOTSUPP;
-out:
-       if (size)
-               hfs_find_exit(&fd);
-       return res;
-}
-
-#define HFSPLUS_ATTRLIST_SIZE (sizeof("hfs.creator")+sizeof("hfs.type"))
-
-ssize_t hfsplus_listxattr(struct dentry *dentry, char *buffer, size_t size)
-{
-       struct inode *inode = dentry->d_inode;
-
-       if (!S_ISREG(inode->i_mode) || HFSPLUS_IS_RSRC(inode))
-               return -EOPNOTSUPP;
-
-       if (!buffer || !size)
-               return HFSPLUS_ATTRLIST_SIZE;
-       if (size < HFSPLUS_ATTRLIST_SIZE)
-               return -ERANGE;
-       strcpy(buffer, "hfs.type");
-       strcpy(buffer + sizeof("hfs.type"), "hfs.creator");
-
-       return HFSPLUS_ATTRLIST_SIZE;
-}