From: Anand Jain <anand.jain@oracle.com>
To: linux-btrfs@vger.kernel.org
Subject: [PATCH v5 5/9] btrfs: start transaction in btrfs_set_prop_trans
Date: Fri, 1 Mar 2019 12:34:51 +0800 [thread overview]
Message-ID: <1551414895-22925-6-git-send-email-anand.jain@oracle.com> (raw)
In-Reply-To: <1551414895-22925-1-git-send-email-anand.jain@oracle.com>
In preparation to make trans argument of btrfs_setxattr() a mandatory,
start the transaction in btrfs_set_prop_trans(). And pass the started
transaction to btrfs_set_prop() instead of NULL. This patch copies the
inode update part from btrfs_setxattr() to btrfs_set_prop_trans(),
as it is from the original code.
Signed-off-by: Anand Jain <anand.jain@oracle.com>
---
v5: fix c-style. Used BUG_ON, instead of ASSERT. Change log update.
v4: born
fs/btrfs/props.c | 22 +++++++++++++++++++++-
1 file changed, 21 insertions(+), 1 deletion(-)
diff --git a/fs/btrfs/props.c b/fs/btrfs/props.c
index ca4af745fb90..75a68d7d39a2 100644
--- a/fs/btrfs/props.c
+++ b/fs/btrfs/props.c
@@ -4,6 +4,7 @@
*/
#include <linux/hashtable.h>
+#include <linux/iversion.h>
#include "props.h"
#include "btrfs_inode.h"
#include "transaction.h"
@@ -103,7 +104,26 @@ static int btrfs_set_prop(struct btrfs_trans_handle *trans, struct inode *inode,
int btrfs_set_prop_trans(struct inode *inode, const char *name,
const char *value, size_t value_len, int flags)
{
- return btrfs_set_prop(NULL, inode, name, value, value_len, flags);
+ struct btrfs_root *root = BTRFS_I(inode)->root;
+ struct btrfs_trans_handle *trans;
+ int ret;
+
+ trans = btrfs_start_transaction(root, 2);
+ if (IS_ERR(trans))
+ return PTR_ERR(trans);
+
+ ret = btrfs_set_prop(trans, inode, name, value, value_len, flags);
+
+ if (!ret) {
+ 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;
}
static int iterate_object_props(struct btrfs_root *root,
--
1.8.3.1
next prev parent reply other threads:[~2019-03-01 4:35 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-01 4:34 [PATCH v5 0/9] Misc props.c cleanups Anand Jain
2019-03-01 4:34 ` [PATCH v5 1/9] btrfs: kill __btrfs_set_prop() Anand Jain
2019-03-01 4:34 ` [PATCH v5 2/9] btrfs: drop redundant forward declaration in props.c Anand Jain
2019-03-01 4:34 ` [PATCH v5 3/9] btrfs: rename fs_info argument to fs_private Anand Jain
2019-03-01 4:34 ` [PATCH v5 4/9] btrfs: refactor btrfs_set_prop add btrfs_set_prop_trans Anand Jain
2019-03-08 14:49 ` David Sterba
2019-03-01 4:34 ` Anand Jain [this message]
2019-03-01 4:34 ` [PATCH v5 6/9] btrfs: start transaction in btrfs_set_acl Anand Jain
2019-03-08 14:52 ` David Sterba
2019-03-01 4:34 ` [PATCH v5 7/9] btrfs: start transaction in btrfs_xattr_handler_set Anand Jain
2019-03-01 4:34 ` [PATCH v5 8/9] btrfs: btrfs_setxattr argument trans is never NULL Anand Jain
2019-03-01 4:34 ` [PATCH v5 9/9] btrfs: kill btrfs_setxattr Anand Jain
2019-03-08 14:56 ` David Sterba
2019-03-09 1:18 ` Anand Jain
2019-03-08 15:01 ` [PATCH v5 0/9] Misc props.c cleanups David Sterba
2019-03-09 0:04 ` Anand Jain
2019-03-11 14:41 ` David Sterba
2019-03-12 11:12 ` Anand Jain
2019-03-12 17:22 ` David Sterba
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=1551414895-22925-6-git-send-email-anand.jain@oracle.com \
--to=anand.jain@oracle.com \
--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).