diff options
| author | Jeff Layton <jlayton@redhat.com> | 2016-11-10 07:42:02 -0500 |
|---|---|---|
| committer | Ilya Dryomov <idryomov@gmail.com> | 2016-12-12 23:54:28 +0100 |
| commit | 9670079f5f0a52b4ddcc16c407cfe9ff42633e04 (patch) | |
| tree | b25a4f1f4db55431512dd4596ffded6e5a96247d /fs/ceph | |
| parent | 4945a084799e24f0954e20f81b9004749cba93e4 (diff) | |
| download | linux-stable-9670079f5f0a52b4ddcc16c407cfe9ff42633e04.tar.gz linux-stable-9670079f5f0a52b4ddcc16c407cfe9ff42633e04.tar.bz2 linux-stable-9670079f5f0a52b4ddcc16c407cfe9ff42633e04.zip | |
ceph: move xattr initialzation before the encoding past the ceph_mds_caps
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>
Reviewed-by: Yan, Zheng <zyan@redhat.com>
Diffstat (limited to 'fs/ceph')
| -rw-r--r-- | fs/ceph/caps.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c index 843aa873eb1c..483baab2b170 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; } |