Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

[linux-2.6] / fs / ext3 / acl.c

diff --git a/fs/ext3/acl.c b/fs/ext3/acl.c
index 638c13a26c0375dc5536fe44e51963c1cf217040..3ac38266fc9e598c21a89593d5893f27b10bfc25 100644 (file)
--- a/fs/ext3/acl.c
+++ b/fs/ext3/acl.c
@@ -393,7 +393,8 @@ ext3_acl_chmod(struct inode *inode)
                int retries = 0;
 
        retry:
-               handle = ext3_journal_start(inode, EXT3_DATA_TRANS_BLOCKS);
+               handle = ext3_journal_start(inode,
+                               EXT3_DATA_TRANS_BLOCKS(inode->i_sb));
                if (IS_ERR(handle)) {
                        error = PTR_ERR(handle);
                        ext3_std_error(inode->i_sb, error);
@@ -417,12 +418,12 @@ static size_t
 ext3_xattr_list_acl_access(struct inode *inode, char *list, size_t list_len,
                           const char *name, size_t name_len)
 {
-       const size_t size = sizeof(XATTR_NAME_ACL_ACCESS);
+       const size_t size = sizeof(POSIX_ACL_XATTR_ACCESS);
 
        if (!test_opt(inode->i_sb, POSIX_ACL))
                return 0;
        if (list && size <= list_len)
-               memcpy(list, XATTR_NAME_ACL_ACCESS, size);
+               memcpy(list, POSIX_ACL_XATTR_ACCESS, size);
        return size;
 }
 
@@ -430,12 +431,12 @@ static size_t
 ext3_xattr_list_acl_default(struct inode *inode, char *list, size_t list_len,
                            const char *name, size_t name_len)
 {
-       const size_t size = sizeof(XATTR_NAME_ACL_DEFAULT);
+       const size_t size = sizeof(POSIX_ACL_XATTR_DEFAULT);
 
        if (!test_opt(inode->i_sb, POSIX_ACL))
                return 0;
        if (list && size <= list_len)
-               memcpy(list, XATTR_NAME_ACL_DEFAULT, size);
+               memcpy(list, POSIX_ACL_XATTR_DEFAULT, size);
        return size;
 }
 
@@ -503,7 +504,7 @@ ext3_xattr_set_acl(struct inode *inode, int type, const void *value,
                acl = NULL;
 
 retry:
-       handle = ext3_journal_start(inode, EXT3_DATA_TRANS_BLOCKS);
+       handle = ext3_journal_start(inode, EXT3_DATA_TRANS_BLOCKS(inode->i_sb));
        if (IS_ERR(handle))
                return PTR_ERR(handle);
        error = ext3_set_acl(handle, inode, type, acl);
@@ -535,14 +536,14 @@ ext3_xattr_set_acl_default(struct inode *inode, const char *name,
 }
 
 struct xattr_handler ext3_xattr_acl_access_handler = {
-       .prefix = XATTR_NAME_ACL_ACCESS,
+       .prefix = POSIX_ACL_XATTR_ACCESS,
        .list   = ext3_xattr_list_acl_access,
        .get    = ext3_xattr_get_acl_access,
        .set    = ext3_xattr_set_acl_access,
 };
 
 struct xattr_handler ext3_xattr_acl_default_handler = {
-       .prefix = XATTR_NAME_ACL_DEFAULT,
+       .prefix = POSIX_ACL_XATTR_DEFAULT,
        .list   = ext3_xattr_list_acl_default,
        .get    = ext3_xattr_get_acl_default,
        .set    = ext3_xattr_set_acl_default,