switch shmem to inode->i_acl

[pandora-kernel.git] / mm / shmem_acl.c

diff --git a/mm/shmem_acl.c b/mm/shmem_acl.c
index 8e5aadd..606a8e7 100644 (file)
--- a/mm/shmem_acl.c
+++ b/mm/shmem_acl.c
@@ -22,11 +22,11 @@ shmem_get_acl(struct inode *inode, int type)
        spin_lock(&inode->i_lock);
        switch(type) {
                case ACL_TYPE_ACCESS:
-                       acl = posix_acl_dup(SHMEM_I(inode)->i_acl);
+                       acl = posix_acl_dup(inode->i_acl);
                        break;
 
                case ACL_TYPE_DEFAULT:
-                       acl = posix_acl_dup(SHMEM_I(inode)->i_default_acl);
+                       acl = posix_acl_dup(inode->i_default_acl);
                        break;
        }
        spin_unlock(&inode->i_lock);
@@ -45,13 +45,13 @@ shmem_set_acl(struct inode *inode, int type, struct posix_acl *acl)
        spin_lock(&inode->i_lock);
        switch(type) {
                case ACL_TYPE_ACCESS:
-                       free = SHMEM_I(inode)->i_acl;
-                       SHMEM_I(inode)->i_acl = posix_acl_dup(acl);
+                       free = inode->i_acl;
+                       inode->i_acl = posix_acl_dup(acl);
                        break;
 
                case ACL_TYPE_DEFAULT:
-                       free = SHMEM_I(inode)->i_default_acl;
-                       SHMEM_I(inode)->i_default_acl = posix_acl_dup(acl);
+                       free = inode->i_default_acl;
+                       inode->i_default_acl = posix_acl_dup(acl);
                        break;
        }
        spin_unlock(&inode->i_lock);
@@ -154,23 +154,6 @@ shmem_acl_init(struct inode *inode, struct inode *dir)
        return generic_acl_init(inode, dir, &shmem_acl_ops);
 }
 
-/**
- * shmem_acl_destroy_inode  -  destroy acls hanging off the in-memory inode
- *
- * This is done before destroying the actual inode.
- */
-
-void
-shmem_acl_destroy_inode(struct inode *inode)
-{
-       if (SHMEM_I(inode)->i_acl)
-               posix_acl_release(SHMEM_I(inode)->i_acl);
-       SHMEM_I(inode)->i_acl = NULL;
-       if (SHMEM_I(inode)->i_default_acl)
-               posix_acl_release(SHMEM_I(inode)->i_default_acl);
-       SHMEM_I(inode)->i_default_acl = NULL;
-}
-
 /**
  * shmem_check_acl  -  check_acl() callback for generic_permission()
  */