diff options
| author | Nicholas Mc Guire <hofrat@osadl.org> | 2015-03-10 16:18:15 +0100 |
|---|---|---|
| committer | Ilya Dryomov <idryomov@gmail.com> | 2015-04-20 16:30:23 +0200 |
| commit | 57e95460f0b360c4d29c0320922b46b55dd2b79f (patch) | |
| tree | 7baff708f8c42e18ef62075baa00514008e50a37 | |
| parent | ceph: use msecs_to_jiffies for time conversion (diff) | |
| download | linux-57e95460f0b360c4d29c0320922b46b55dd2b79f.tar.xz linux-57e95460f0b360c4d29c0320922b46b55dd2b79f.zip | |
ceph: match wait_for_completion_timeout return type
return type of wait_for_completion_timeout is unsigned long not int. An
appropriately named unsigned long is added and the assignment fixed up.
Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org>
Signed-off-by: Yan, Zheng <zyan@redhat.com>
| -rw-r--r-- | fs/ceph/dir.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c index 92a6b6018511..d486f2a5a88d 100644 --- a/fs/ceph/dir.c +++ b/fs/ceph/dir.c @@ -1242,11 +1242,12 @@ static int ceph_dir_fsync(struct file *file, loff_t start, loff_t end, dout("dir_fsync %p wait on tid %llu (until %llu)\n", inode, req->r_tid, last_tid); if (req->r_timeout) { - ret = wait_for_completion_timeout( - &req->r_safe_completion, req->r_timeout); - if (ret > 0) + unsigned long time_left = wait_for_completion_timeout( + &req->r_safe_completion, + req->r_timeout); + if (time_left > 0) ret = 0; - else if (ret == 0) + else ret = -EIO; /* timed out */ } else { wait_for_completion(&req->r_safe_completion); |