diff options
| -rw-r--r-- | fs/ceph/locks.c | 7 | ||||
| -rw-r--r-- | fs/ceph/mds_client.c | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/fs/ceph/locks.c b/fs/ceph/locks.c index 202dd3d68be0..a80ed18d64ff 100644 --- a/fs/ceph/locks.c +++ b/fs/ceph/locks.c | |||
| @@ -206,10 +206,12 @@ int ceph_encode_locks(struct inode *inode, struct ceph_pagelist *pagelist, | |||
| 206 | int err = 0; | 206 | int err = 0; |
| 207 | int seen_fcntl = 0; | 207 | int seen_fcntl = 0; |
| 208 | int seen_flock = 0; | 208 | int seen_flock = 0; |
| 209 | __le32 nlocks; | ||
| 209 | 210 | ||
| 210 | dout("encoding %d flock and %d fcntl locks", num_flock_locks, | 211 | dout("encoding %d flock and %d fcntl locks", num_flock_locks, |
| 211 | num_fcntl_locks); | 212 | num_fcntl_locks); |
| 212 | err = ceph_pagelist_append(pagelist, &num_fcntl_locks, sizeof(u32)); | 213 | nlocks = cpu_to_le32(num_fcntl_locks); |
| 214 | err = ceph_pagelist_append(pagelist, &nlocks, sizeof(nlocks)); | ||
| 213 | if (err) | 215 | if (err) |
| 214 | goto fail; | 216 | goto fail; |
| 215 | for (lock = inode->i_flock; lock != NULL; lock = lock->fl_next) { | 217 | 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, | |||
| 229 | goto fail; | 231 | goto fail; |
| 230 | } | 232 | } |
| 231 | 233 | ||
| 232 | err = ceph_pagelist_append(pagelist, &num_flock_locks, sizeof(u32)); | 234 | nlocks = cpu_to_le32(num_flock_locks); |
| 235 | err = ceph_pagelist_append(pagelist, &nlocks, sizeof(nlocks)); | ||
| 233 | if (err) | 236 | if (err) |
| 234 | goto fail; | 237 | goto fail; |
| 235 | for (lock = inode->i_flock; lock != NULL; lock = lock->fl_next) { | 238 | for (lock = inode->i_flock; lock != NULL; lock = lock->fl_next) { |
diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c index 4f22671a5bd4..d9ca15255477 100644 --- a/fs/ceph/mds_client.c +++ b/fs/ceph/mds_client.c | |||
| @@ -2485,7 +2485,7 @@ static int encode_caps_cb(struct inode *inode, struct ceph_cap *cap, | |||
| 2485 | lock_flocks(); | 2485 | lock_flocks(); |
| 2486 | ceph_count_locks(inode, &num_fcntl_locks, | 2486 | ceph_count_locks(inode, &num_fcntl_locks, |
| 2487 | &num_flock_locks); | 2487 | &num_flock_locks); |
| 2488 | rec.v2.flock_len = (2*sizeof(u32) + | 2488 | rec.v2.flock_len = cpu_to_le32(2*sizeof(u32) + |
| 2489 | (num_fcntl_locks+num_flock_locks) * | 2489 | (num_fcntl_locks+num_flock_locks) * |
| 2490 | sizeof(struct ceph_filelock)); | 2490 | sizeof(struct ceph_filelock)); |
| 2491 | unlock_flocks(); | 2491 | unlock_flocks(); |
