fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / fs / hfsplus / ioctl.c

diff --git a/fs/hfsplus/ioctl.c b/fs/hfsplus/ioctl.c
index bd05477..b98935d 100644 (file)
--- a/fs/hfsplus/ioctl.c
+++ b/fs/hfsplus/ioctl.c
@@ -12,8 +12,11 @@
  * hfsplus ioctls
  */
 
+#include <linux/capability.h>
 #include <linux/fs.h>
 #include <linux/sched.h>
+#include <linux/xattr.h>
+#include <linux/mount.h>
 #include <asm/uaccess.h>
 #include "hfsplus_fs.h"
 
@@ -26,14 +29,15 @@ int hfsplus_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,
        case HFSPLUS_IOC_EXT2_GETFLAGS:
                flags = 0;
                if (HFSPLUS_I(inode).rootflags & HFSPLUS_FLG_IMMUTABLE)
-                       flags |= EXT2_FLAG_IMMUTABLE; /* EXT2_IMMUTABLE_FL */
+                       flags |= FS_IMMUTABLE_FL; /* EXT2_IMMUTABLE_FL */
                if (HFSPLUS_I(inode).rootflags & HFSPLUS_FLG_APPEND)
-                       flags |= EXT2_FLAG_APPEND; /* EXT2_APPEND_FL */
+                       flags |= FS_APPEND_FL; /* EXT2_APPEND_FL */
                if (HFSPLUS_I(inode).userflags & HFSPLUS_FLG_NODUMP)
-                       flags |= EXT2_FLAG_NODUMP; /* EXT2_NODUMP_FL */
+                       flags |= FS_NODUMP_FL; /* EXT2_NODUMP_FL */
                return put_user(flags, (int __user *)arg);
        case HFSPLUS_IOC_EXT2_SETFLAGS: {
-               if (IS_RDONLY(inode))
+               if (IS_RDONLY(inode) ||
+                       (filp && MNT_IS_RDONLY(filp->f_vfsmnt)))
                        return -EROFS;
 
                if ((current->fsuid != inode->i_uid) && !capable(CAP_FOWNER))
@@ -42,37 +46,36 @@ int hfsplus_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,
                if (get_user(flags, (int __user *)arg))
                        return -EFAULT;
 
-               if (flags & (EXT2_FLAG_IMMUTABLE|EXT2_FLAG_APPEND) ||
+               if (flags & (FS_IMMUTABLE_FL|FS_APPEND_FL) ||
                    HFSPLUS_I(inode).rootflags & (HFSPLUS_FLG_IMMUTABLE|HFSPLUS_FLG_APPEND)) {
                        if (!capable(CAP_LINUX_IMMUTABLE))
                                return -EPERM;
                }
 
                /* don't silently ignore unsupported ext2 flags */
-               if (flags & ~(EXT2_FLAG_IMMUTABLE|EXT2_FLAG_APPEND|
-                             EXT2_FLAG_NODUMP))
+               if (flags & ~(FS_IMMUTABLE_FL|FS_APPEND_FL|FS_NODUMP_FL))
                        return -EOPNOTSUPP;
 
-               if (flags & EXT2_FLAG_IMMUTABLE) { /* EXT2_IMMUTABLE_FL */
+               if (flags & FS_IMMUTABLE_FL) { /* EXT2_IMMUTABLE_FL */
                        inode->i_flags |= S_IMMUTABLE;
                        HFSPLUS_I(inode).rootflags |= HFSPLUS_FLG_IMMUTABLE;
                } else {
                        inode->i_flags &= ~S_IMMUTABLE;
                        HFSPLUS_I(inode).rootflags &= ~HFSPLUS_FLG_IMMUTABLE;
                }
-               if (flags & EXT2_FLAG_APPEND) { /* EXT2_APPEND_FL */
+               if (flags & FS_APPEND_FL) { /* EXT2_APPEND_FL */
                        inode->i_flags |= S_APPEND;
                        HFSPLUS_I(inode).rootflags |= HFSPLUS_FLG_APPEND;
                } else {
                        inode->i_flags &= ~S_APPEND;
                        HFSPLUS_I(inode).rootflags &= ~HFSPLUS_FLG_APPEND;
                }
-               if (flags & EXT2_FLAG_NODUMP) /* EXT2_NODUMP_FL */
+               if (flags & FS_NODUMP_FL) /* EXT2_NODUMP_FL */
                        HFSPLUS_I(inode).userflags |= HFSPLUS_FLG_NODUMP;
                else
                        HFSPLUS_I(inode).userflags &= ~HFSPLUS_FLG_NODUMP;
 
-               inode->i_ctime = CURRENT_TIME;
+               inode->i_ctime = CURRENT_TIME_SEC;
                mark_inode_dirty(inode);
                return 0;
        }
@@ -80,3 +83,108 @@ int hfsplus_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,
                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));
+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 = -ENODATA;
+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;
+}