diff options
Diffstat (limited to 'fs/ceph/locks.c')
| -rw-r--r-- | fs/ceph/locks.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/fs/ceph/locks.c b/fs/ceph/locks.c index ae85af06454f..ff4e753aae92 100644 --- a/fs/ceph/locks.c +++ b/fs/ceph/locks.c | |||
| @@ -82,7 +82,8 @@ int ceph_lock(struct file *file, int cmd, struct file_lock *fl) | |||
| 82 | length = fl->fl_end - fl->fl_start + 1; | 82 | length = fl->fl_end - fl->fl_start + 1; |
| 83 | 83 | ||
| 84 | err = ceph_lock_message(CEPH_LOCK_FCNTL, op, file, | 84 | err = ceph_lock_message(CEPH_LOCK_FCNTL, op, file, |
| 85 | (u64)fl->fl_pid, (u64)fl->fl_nspid, | 85 | (u64)fl->fl_pid, |
| 86 | (u64)(unsigned long)fl->fl_nspid, | ||
| 86 | lock_cmd, fl->fl_start, | 87 | lock_cmd, fl->fl_start, |
| 87 | length, wait); | 88 | length, wait); |
| 88 | if (!err) { | 89 | if (!err) { |
| @@ -92,7 +93,8 @@ int ceph_lock(struct file *file, int cmd, struct file_lock *fl) | |||
| 92 | /* undo! This should only happen if the kernel detects | 93 | /* undo! This should only happen if the kernel detects |
| 93 | * local deadlock. */ | 94 | * local deadlock. */ |
| 94 | ceph_lock_message(CEPH_LOCK_FCNTL, op, file, | 95 | ceph_lock_message(CEPH_LOCK_FCNTL, op, file, |
| 95 | (u64)fl->fl_pid, (u64)fl->fl_nspid, | 96 | (u64)fl->fl_pid, |
| 97 | (u64)(unsigned long)fl->fl_nspid, | ||
| 96 | CEPH_LOCK_UNLOCK, fl->fl_start, | 98 | CEPH_LOCK_UNLOCK, fl->fl_start, |
| 97 | length, 0); | 99 | length, 0); |
| 98 | dout("got %d on posix_lock_file, undid lock", err); | 100 | dout("got %d on posix_lock_file, undid lock", err); |
| @@ -132,7 +134,8 @@ int ceph_flock(struct file *file, int cmd, struct file_lock *fl) | |||
| 132 | length = fl->fl_end - fl->fl_start + 1; | 134 | length = fl->fl_end - fl->fl_start + 1; |
| 133 | 135 | ||
| 134 | err = ceph_lock_message(CEPH_LOCK_FLOCK, CEPH_MDS_OP_SETFILELOCK, | 136 | err = ceph_lock_message(CEPH_LOCK_FLOCK, CEPH_MDS_OP_SETFILELOCK, |
| 135 | file, (u64)fl->fl_pid, (u64)fl->fl_nspid, | 137 | file, (u64)fl->fl_pid, |
| 138 | (u64)(unsigned long)fl->fl_nspid, | ||
| 136 | lock_cmd, fl->fl_start, | 139 | lock_cmd, fl->fl_start, |
| 137 | length, wait); | 140 | length, wait); |
| 138 | if (!err) { | 141 | if (!err) { |
| @@ -141,7 +144,7 @@ int ceph_flock(struct file *file, int cmd, struct file_lock *fl) | |||
| 141 | ceph_lock_message(CEPH_LOCK_FLOCK, | 144 | ceph_lock_message(CEPH_LOCK_FLOCK, |
| 142 | CEPH_MDS_OP_SETFILELOCK, | 145 | CEPH_MDS_OP_SETFILELOCK, |
| 143 | file, (u64)fl->fl_pid, | 146 | file, (u64)fl->fl_pid, |
| 144 | (u64)fl->fl_nspid, | 147 | (u64)(unsigned long)fl->fl_nspid, |
| 145 | CEPH_LOCK_UNLOCK, fl->fl_start, | 148 | CEPH_LOCK_UNLOCK, fl->fl_start, |
| 146 | length, 0); | 149 | length, 0); |
| 147 | dout("got %d on flock_lock_file_wait, undid lock", err); | 150 | dout("got %d on flock_lock_file_wait, undid lock", err); |
| @@ -235,7 +238,8 @@ int lock_to_ceph_filelock(struct file_lock *lock, | |||
| 235 | cephlock->length = cpu_to_le64(lock->fl_end - lock->fl_start + 1); | 238 | cephlock->length = cpu_to_le64(lock->fl_end - lock->fl_start + 1); |
| 236 | cephlock->client = cpu_to_le64(0); | 239 | cephlock->client = cpu_to_le64(0); |
| 237 | cephlock->pid = cpu_to_le64(lock->fl_pid); | 240 | cephlock->pid = cpu_to_le64(lock->fl_pid); |
| 238 | cephlock->pid_namespace = cpu_to_le64((u64)lock->fl_nspid); | 241 | cephlock->pid_namespace = |
| 242 | cpu_to_le64((u64)(unsigned long)lock->fl_nspid); | ||
| 239 | 243 | ||
| 240 | switch (lock->fl_type) { | 244 | switch (lock->fl_type) { |
| 241 | case F_RDLCK: | 245 | case F_RDLCK: |