From: Anand Jain <anand.jain@oracle.com>
To: linux-btrfs@vger.kernel.org
Cc: dsterba@suse.cz
Subject: [PATCH 2/4] btrfs: rename __btrfs_set_acl to do_set_acl
Date: Thu, 4 Apr 2019 00:51:32 +0800 [thread overview]
Message-ID: <20190403165134.12378-3-anand.jain@oracle.com> (raw)
In-Reply-To: <20190403165134.12378-1-anand.jain@oracle.com>
__btrfs_set_acl() is helper function of btrfs_set_acl(), rename it to
do_set_acl(). No functional changes.
Signed-off-by: Anand Jain <anand.jain@oracle.com>
---
fs/btrfs/acl.c | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/fs/btrfs/acl.c b/fs/btrfs/acl.c
index 5810463dc6d2..a22ebb04d9ca 100644
--- a/fs/btrfs/acl.c
+++ b/fs/btrfs/acl.c
@@ -52,8 +52,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;
@@ -113,7 +113,7 @@ int btrfs_set_acl(struct inode *inode, struct posix_acl *acl, int type)
if (ret)
return ret;
}
- ret = __btrfs_set_acl(NULL, inode, acl, type);
+ ret = do_set_acl(NULL, inode, acl, type);
if (ret)
inode->i_mode = old_mode;
return ret;
@@ -134,15 +134,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);
}
--
2.17.1
next prev parent reply other threads:[~2019-04-03 16:51 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-03 16:51 [PATCH 0/4] property fixes and cleanups Anand Jain
2019-04-03 16:51 ` [PATCH 1/4] btrfs: rename __btrfs_set_prop to btrfs_set_prop_trans Anand Jain
2019-04-03 16:51 ` Anand Jain [this message]
2019-04-03 16:51 ` [PATCH 3/4] btrfs: fix zstd compression parameter Anand Jain
2019-04-03 16:51 ` [PATCH 4/4] btrfs: fix vanished compression property after failed set Anand Jain
2019-04-08 3:25 ` [PATCH 0/4] property fixes and cleanups Anand Jain
2019-04-08 17:02 ` David Sterba
2019-04-08 23:23 ` David Sterba
2019-04-09 5:34 ` Anand Jain
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190403165134.12378-3-anand.jain@oracle.com \
--to=anand.jain@oracle.com \
--cc=dsterba@suse.cz \
--cc=linux-btrfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).