From: Jeff Layton <jlayton@redhat.com>
To: idryomov@gmail.com, zyan@redhat.com, sage@redhat.com
Cc: ceph-devel@vger.kernel.org
Subject: [PATCH 2/5] ceph: move xattr initialzation before the encoding past the ceph_mds_caps
Date: Thu, 10 Nov 2016 07:52:11 -0500 [thread overview]
Message-ID: <1478782334-20667-3-git-send-email-jlayton@redhat.com> (raw)
In-Reply-To: <1478782334-20667-1-git-send-email-jlayton@redhat.com>
Just for clarity. This part is inside the header, so it makes sense to
group it with the rest of the stuff in the header.
Signed-off-by: Jeff Layton <jlayton@redhat.com>
---
fs/ceph/caps.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c
index d37a04b87d2c..2a5caee2fb17 100644
--- a/fs/ceph/caps.c
+++ b/fs/ceph/caps.c
@@ -1057,6 +1057,13 @@ static int send_cap_msg(struct ceph_mds_session *session,
fc->gid = cpu_to_le32(from_kgid(&init_user_ns, gid));
fc->mode = cpu_to_le32(mode);
+ fc->xattr_version = cpu_to_le64(xattr_version);
+ if (xattrs_buf) {
+ msg->middle = ceph_buffer_get(xattrs_buf);
+ fc->xattr_len = cpu_to_le32(xattrs_buf->vec.iov_len);
+ msg->hdr.middle_len = cpu_to_le32(xattrs_buf->vec.iov_len);
+ }
+
p = fc + 1;
/* flock buffer size */
ceph_encode_32(&p, 0);
@@ -1069,13 +1076,6 @@ static int send_cap_msg(struct ceph_mds_session *session,
/* oldest_flush_tid */
ceph_encode_64(&p, oldest_flush_tid);
- fc->xattr_version = cpu_to_le64(xattr_version);
- if (xattrs_buf) {
- msg->middle = ceph_buffer_get(xattrs_buf);
- fc->xattr_len = cpu_to_le32(xattrs_buf->vec.iov_len);
- msg->hdr.middle_len = cpu_to_le32(xattrs_buf->vec.iov_len);
- }
-
ceph_con_send(&session->s_con, msg);
return 0;
}
--
2.7.4
next prev parent reply other threads:[~2016-11-10 12:52 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-10 12:52 [PATCH 0/5] ceph: fix long stalls during fsync and write_inode Jeff Layton
2016-11-10 12:52 ` [PATCH 1/5] ceph: fix minor typo in unsafe_request_wait Jeff Layton
2016-11-10 12:52 ` Jeff Layton [this message]
2016-11-10 12:52 ` [PATCH 3/5] ceph: define new argument structure for send_cap_msg Jeff Layton
2016-11-10 12:52 ` [PATCH 4/5] ceph: update cap message struct version to 10 Jeff Layton
2016-11-10 12:52 ` [PATCH 5/5] ceph: add flags parameter to send_cap_msg Jeff Layton
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=1478782334-20667-3-git-send-email-jlayton@redhat.com \
--to=jlayton@redhat.com \
--cc=ceph-devel@vger.kernel.org \
--cc=idryomov@gmail.com \
--cc=sage@redhat.com \
--cc=zyan@redhat.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.