Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c420276a authored by Jim Schutt's avatar Jim Schutt Committed by Alex Elder
Browse files

ceph: add cpu_to_le32() calls when encoding a reconnect capability 

In his review, Alex Elder mentioned that he hadn't checked that
num_fcntl_locks and num_flock_locks were properly decoded on the
server side, from a le32 over-the-wire type to a cpu type.
I checked, and AFAICS it is done; those interested can consult
    Locker::_do_cap_update()
in src/mds/Locker.cc and src/include/encoding.h in the Ceph server
code (git://github.com/ceph/ceph

).

I also checked the server side for flock_len decoding, and I believe
that also happens correctly, by virtue of having been declared
__le32 in struct ceph_mds_cap_reconnect, in src/include/ceph_fs.h.

Cc: stable@vger.kernel.org # 3.4+
Signed-off-by: default avatarJim Schutt <jaschut@sandia.gov>
Reviewed-by: default avatarAlex Elder <elder@inktank.com>
parent 14d2f38d

fs/ceph/locks.c

+5 −2
Original line number Diff line number Diff line
@@ -206,10 +206,12 @@ int ceph_encode_locks(struct inode *inode, struct ceph_pagelist *pagelist, 
	int err = 0;

	int seen_fcntl = 0;

	int seen_flock = 0;

	__le32 nlocks;



	dout("encoding %d flock and %d fcntl locks", num_flock_locks,

	     num_fcntl_locks);

	err = ceph_pagelist_append(pagelist, &num_fcntl_locks, sizeof(u32));

	nlocks = cpu_to_le32(num_fcntl_locks);

	err = ceph_pagelist_append(pagelist, &nlocks, sizeof(nlocks));

	if (err)

		goto fail;

	for (lock = inode->i_flock; lock != NULL; lock = lock->fl_next) {
@@ -229,7 +231,8 @@ int ceph_encode_locks(struct inode *inode, struct ceph_pagelist *pagelist, 
			goto fail;

	}



	err = ceph_pagelist_append(pagelist, &num_flock_locks, sizeof(u32));

	nlocks = cpu_to_le32(num_flock_locks);

	err = ceph_pagelist_append(pagelist, &nlocks, sizeof(nlocks));

	if (err)

		goto fail;

	for (lock = inode->i_flock; lock != NULL; lock = lock->fl_next) {

fs/ceph/mds_client.c

+1 −1
Original line number Diff line number Diff line
@@ -2485,7 +2485,7 @@ static int encode_caps_cb(struct inode *inode, struct ceph_cap *cap, 
			lock_flocks();

			ceph_count_locks(inode, &num_fcntl_locks,

					 &num_flock_locks);

			rec.v2.flock_len = (2*sizeof(u32) +

			rec.v2.flock_len = cpu_to_le32(2*sizeof(u32) +

					    (num_fcntl_locks+num_flock_locks) *

					    sizeof(struct ceph_filelock));

			unlock_flocks();