]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
kclient: cancel old work before rescheduling
authorSage Weil <sage@newdream.net>
Wed, 16 Apr 2008 16:52:23 +0000 (09:52 -0700)
committerSage Weil <sage@newdream.net>
Wed, 16 Apr 2008 16:52:34 +0000 (09:52 -0700)
src/kernel/inode.c

index 0129d0db70bd39d2054897835b4546c4793e9e66..d8a7ef385681f927629697c3d2705bbafb00a1b6 100644 (file)
@@ -769,6 +769,7 @@ retry:
                if (until > ci->i_hold_caps_until) {
                        ci->i_hold_caps_until = until;
                        dout(10, "hold_caps_until %lu\n", until);
+                       cancel_delayed_work(&ci->i_cap_dwork);
                        schedule_delayed_work(&ci->i_cap_dwork, 
                                              until - jiffies);
                }