From: Anand Jain <anand.jain@oracle.com>
To: linux-btrfs@vger.kernel.org
Cc: dsterba@suse.cz
Subject: [PATCH 1/4] btrfs: rename __btrfs_set_prop to btrfs_set_prop_trans
Date: Thu, 4 Apr 2019 00:51:31 +0800 [thread overview]
Message-ID: <20190403165134.12378-2-anand.jain@oracle.com> (raw)
In-Reply-To: <20190403165134.12378-1-anand.jain@oracle.com>
__btrfs_set_prop() accepts trans an argument, which when NULL,
the trans is created further down at btrfs_setxattr().
So btrfs_set_prop() is a redirect to __btrfs_set_prop() with the
transaction handle equal to NULL. No functional changes.
Signed-off-by: Anand Jain <anand.jain@oracle.com>
---
fs/btrfs/props.c | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/fs/btrfs/props.c b/fs/btrfs/props.c
index 7466ffd33ba6..0939554ffa63 100644
--- a/fs/btrfs/props.c
+++ b/fs/btrfs/props.c
@@ -55,12 +55,9 @@ find_prop_handler(const char *name,
return NULL;
}
-static int __btrfs_set_prop(struct btrfs_trans_handle *trans,
- struct inode *inode,
- const char *name,
- const char *value,
- size_t value_len,
- int flags)
+static int btrfs_set_prop_trans(struct btrfs_trans_handle *trans,
+ struct inode *inode, const char *name,
+ const char *value, size_t value_len, int flags)
{
const struct prop_handler *handler;
int ret;
@@ -109,7 +106,7 @@ int btrfs_set_prop(struct inode *inode,
size_t value_len,
int flags)
{
- return __btrfs_set_prop(NULL, inode, name, value, value_len, flags);
+ return btrfs_set_prop_trans(NULL, inode, name, value, value_len, flags);
}
static int iterate_object_props(struct btrfs_root *root,
@@ -355,8 +352,8 @@ static int inherit_props(struct btrfs_trans_handle *trans,
num_bytes, BTRFS_RESERVE_NO_FLUSH);
if (ret)
goto out;
- ret = __btrfs_set_prop(trans, inode, h->xattr_name,
- value, strlen(value), 0);
+ ret = btrfs_set_prop_trans(trans, inode, h->xattr_name, value,
+ strlen(value), 0);
btrfs_block_rsv_release(fs_info, trans->block_rsv, num_bytes);
if (ret)
goto out;
--
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 ` Anand Jain [this message]
2019-04-03 16:51 ` [PATCH 2/4] btrfs: rename __btrfs_set_acl to do_set_acl Anand Jain
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-2-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).