|
@@ -205,7 +205,8 @@ struct posix_acl *f2fs_get_acl(struct inode *inode, int type)
|
|
|
return acl;
|
|
|
}
|
|
|
|
|
|
-static int f2fs_set_acl(struct inode *inode, int type, struct posix_acl *acl)
|
|
|
+static int f2fs_set_acl(struct inode *inode, int type,
|
|
|
+ struct posix_acl *acl, struct page *ipage)
|
|
|
{
|
|
|
struct f2fs_sb_info *sbi = F2FS_SB(inode->i_sb);
|
|
|
struct f2fs_inode_info *fi = F2FS_I(inode);
|
|
@@ -250,7 +251,7 @@ static int f2fs_set_acl(struct inode *inode, int type, struct posix_acl *acl)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- error = f2fs_setxattr(inode, name_index, "", value, size, NULL);
|
|
|
+ error = f2fs_setxattr(inode, name_index, "", value, size, ipage);
|
|
|
|
|
|
kfree(value);
|
|
|
if (!error)
|
|
@@ -260,7 +261,7 @@ static int f2fs_set_acl(struct inode *inode, int type, struct posix_acl *acl)
|
|
|
return error;
|
|
|
}
|
|
|
|
|
|
-int f2fs_init_acl(struct inode *inode, struct inode *dir)
|
|
|
+int f2fs_init_acl(struct inode *inode, struct inode *dir, struct page *ipage)
|
|
|
{
|
|
|
struct f2fs_sb_info *sbi = F2FS_SB(dir->i_sb);
|
|
|
struct posix_acl *acl = NULL;
|
|
@@ -280,7 +281,7 @@ int f2fs_init_acl(struct inode *inode, struct inode *dir)
|
|
|
goto cleanup;
|
|
|
|
|
|
if (S_ISDIR(inode->i_mode)) {
|
|
|
- error = f2fs_set_acl(inode, ACL_TYPE_DEFAULT, acl);
|
|
|
+ error = f2fs_set_acl(inode, ACL_TYPE_DEFAULT, acl, ipage);
|
|
|
if (error)
|
|
|
goto cleanup;
|
|
|
}
|
|
@@ -288,7 +289,7 @@ int f2fs_init_acl(struct inode *inode, struct inode *dir)
|
|
|
if (error < 0)
|
|
|
return error;
|
|
|
if (error > 0)
|
|
|
- error = f2fs_set_acl(inode, ACL_TYPE_ACCESS, acl);
|
|
|
+ error = f2fs_set_acl(inode, ACL_TYPE_ACCESS, acl, ipage);
|
|
|
cleanup:
|
|
|
posix_acl_release(acl);
|
|
|
return error;
|
|
@@ -314,7 +315,7 @@ int f2fs_acl_chmod(struct inode *inode)
|
|
|
if (error)
|
|
|
return error;
|
|
|
|
|
|
- error = f2fs_set_acl(inode, ACL_TYPE_ACCESS, acl);
|
|
|
+ error = f2fs_set_acl(inode, ACL_TYPE_ACCESS, acl, NULL);
|
|
|
posix_acl_release(acl);
|
|
|
return error;
|
|
|
}
|
|
@@ -389,7 +390,7 @@ static int f2fs_xattr_set_acl(struct dentry *dentry, const char *name,
|
|
|
acl = NULL;
|
|
|
}
|
|
|
|
|
|
- error = f2fs_set_acl(inode, type, acl);
|
|
|
+ error = f2fs_set_acl(inode, type, acl, NULL);
|
|
|
|
|
|
release_and_out:
|
|
|
posix_acl_release(acl);
|