[PATCH v5 6/9] btrfs: start transaction in btrfs_set_acl

[Anand Jain]

The main motivation is to avoid NULL for the trans argument reaching
btrfs_set_xattr(). This patch does the following in btrfs_set_acl().
  Create transaction and handle the inode changes update, (copies code
    from btrfs_setxattr() as in the original, which needs a fix).
  Rename __btrfs_set_acl to do_set_acl as this is a helper function.
  Fix a c-code style, expand function declaration to max length 80 char.

Signed-off-by: Anand Jain <anand.j...@oracle.com>
---
v5: change log update. Use BUG_ON instead of ASSERT.
v4: born
 fs/btrfs/acl.c | 36 ++++++++++++++++++++++++++----------
 1 file changed, 26 insertions(+), 10 deletions(-)

diff --git a/fs/btrfs/acl.c b/fs/btrfs/acl.c
index 5810463dc6d2..2b9c3394fc34 100644
--- a/fs/btrfs/acl.c
+++ b/fs/btrfs/acl.c
@@ -11,10 +11,12 @@
 #include <linux/sched.h>
 #include <linux/sched/mm.h>
 #include <linux/slab.h>
+#include <linux/iversion.h>
 
 #include "ctree.h"
 #include "btrfs_inode.h"
 #include "xattr.h"
+#include "transaction.h"
 
 struct posix_acl *btrfs_get_acl(struct inode *inode, int type)
 {
@@ -52,8 +54,8 @@ struct posix_acl *btrfs_get_acl(struct inode *inode, int type)
        return acl;
 }
 
-static int __btrfs_set_acl(struct btrfs_trans_handle *trans,
-                        struct inode *inode, struct posix_acl *acl, int type)
+static int do_set_acl(struct btrfs_trans_handle *trans, struct inode *inode,
+                     struct posix_acl *acl, int type)
 {
        int ret, size = 0;
        const char *name;
@@ -107,20 +109,36 @@ int btrfs_set_acl(struct inode *inode, struct posix_acl 
*acl, int type)
 {
        int ret;
        umode_t old_mode = inode->i_mode;
+       struct btrfs_trans_handle *trans;
+       struct btrfs_root *root = BTRFS_I(inode)->root;
 
        if (type == ACL_TYPE_ACCESS && acl) {
                ret = posix_acl_update_mode(inode, &inode->i_mode, &acl);
                if (ret)
                        return ret;
        }
-       ret = __btrfs_set_acl(NULL, inode, acl, type);
-       if (ret)
+
+       trans = btrfs_start_transaction(root, 2);
+       if (IS_ERR(trans))
+               return PTR_ERR(trans);
+
+       ret = do_set_acl(trans, inode, acl, type);
+       if (ret) {
                inode->i_mode = old_mode;
+       } else {
+               inode_inc_iversion(inode);
+               inode->i_ctime = current_time(inode);
+               set_bit(BTRFS_INODE_COPY_EVERYTHING, 
&BTRFS_I(inode)->runtime_flags);
+               ret = btrfs_update_inode(trans, root, inode);
+               BUG_ON(ret);
+       }
+
+       btrfs_end_transaction(trans);
        return ret;
 }
 
-int btrfs_init_acl(struct btrfs_trans_handle *trans,
-                  struct inode *inode, struct inode *dir)
+int btrfs_init_acl(struct btrfs_trans_handle *trans, struct inode *inode,
+                  struct inode *dir)
 {
        struct posix_acl *default_acl, *acl;
        int ret = 0;
@@ -134,15 +152,13 @@ int btrfs_init_acl(struct btrfs_trans_handle *trans,
                return ret;
 
        if (default_acl) {
-               ret = __btrfs_set_acl(trans, inode, default_acl,
-                                     ACL_TYPE_DEFAULT);
+               ret = do_set_acl(trans, inode, default_acl, ACL_TYPE_DEFAULT);
                posix_acl_release(default_acl);
        }
 
        if (acl) {
                if (!ret)
-                       ret = __btrfs_set_acl(trans, inode, acl,
-                                             ACL_TYPE_ACCESS);
+                       ret = do_set_acl(trans, inode, acl, ACL_TYPE_ACCESS);
                posix_acl_release(acl);
        }
 
-- 
1.8.3.1