]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
ceph: match wait_for_completion_timeout return type
authorNicholas Mc Guire <hofrat@osadl.org>
Tue, 10 Mar 2015 15:18:15 +0000 (11:18 -0400)
committerIlya Dryomov <idryomov@gmail.com>
Mon, 20 Apr 2015 14:30:23 +0000 (17:30 +0300)
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>
fs/ceph/dir.c

index 92a6b6018511286f2e710d1b115917fe45378af7..d486f2a5a88d877dd75c9f1a1f101757a1a8f5c8 100644 (file)
@@ -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);