Changed syscall name from exit_fz to cancel_watchdog

5 files changed, 11 insertions, 11 deletions

diff --git a/include/litmus/ctrlpage.h b/include/litmus/ctrlpage.h
index 82350c7d545c..3f47b2c06457 100644
--- a/include/litmus/ctrlpage.h
+++ b/include/litmus/ctrlpage.h
@@ -77,7 +77,7 @@ typedef enum {
         LRT_release_ts,
         LRT_get_current_budget,
         LRT_access_forbidden_zone_check,
-        LRT_exit_forbidden_zone,
+        LRT_cancel_watchdog,
         LRT_litmus_lock_cs
 } litmus_syscall_id_t;
 
diff --git a/include/litmus/locking.h b/include/litmus/locking.h
index 4bb933d1f6c9..d6d8ea4d9eca 100644
--- a/include/litmus/locking.h
+++ b/include/litmus/locking.h
@@ -28,7 +28,7 @@ struct litmus_lock_ops {
 
         /* Current tries to access protected resource (mandatory methods if supported). */
         int (*access_forbidden_zone_check)(struct litmus_lock*, lt_t fz_len, lt_t fz_police);
-        int (*exit_forbidden_zone)(struct litmus_lock*);
+        int (*cancel_watchdog)(struct litmus_lock*);
 
         /* The lock is no longer being referenced (mandatory method). */
         void (*deallocate)(struct litmus_lock*);
diff --git a/litmus/ctrldev.c b/litmus/ctrldev.c
index 42bef9a2618e..f632c2750c83 100644
--- a/litmus/ctrldev.c
+++ b/litmus/ctrldev.c
@@ -131,7 +131,7 @@ asmlinkage long sys_complete_job(void);
 asmlinkage long sys_litmus_lock(int lock_od);
 asmlinkage long sys_litmus_lock_cs(int lock_od, lt_t cs_len);
 asmlinkage long sys_access_forbidden_zone_check(int lock_od, lt_t fz_len, lt_t panic_len);
-asmlinkage long sys_exit_forbidden_zone(int lock_od);
+asmlinkage long sys_cancel_watchdog(int lock_od);
 asmlinkage long sys_litmus_unlock(int lock_od);
 asmlinkage long sys_wait_for_job_release(unsigned int job);
 asmlinkage long sys_wait_for_ts_release(void);
@@ -158,7 +158,7 @@ static long litmus_ctrl_ioctl(struct file *filp,
         case LRT_get_current_budget:
         case LRT_od_open:
         case LRT_access_forbidden_zone_check:
-        case LRT_exit_forbidden_zone:
+        case LRT_cancel_watchdog:
         case LRT_litmus_lock_cs:
                 /* multiple arguments => need to get args via pointer */
                 /* get syscall parameters */
@@ -195,8 +195,8 @@ static long litmus_ctrl_ioctl(struct file *filp,
                                 syscall_args.access_forbidden_zone_check.sem_od,
                                 syscall_args.access_forbidden_zone_check.fz_len,
                                 syscall_args.access_forbidden_zone_check.panic_len);
-                case LRT_exit_forbidden_zone:
-                        return sys_exit_forbidden_zone(
+                case LRT_cancel_watchdog:
+                        return sys_cancel_watchdog(
                                 syscall_args.access_forbidden_zone_check.sem_od);
                 case LRT_litmus_lock_cs:
                         return sys_litmus_lock_cs(
diff --git a/litmus/locking.c b/litmus/locking.c
index b42c3e88f321..0c0457ff097e 100644
--- a/litmus/locking.c
+++ b/litmus/locking.c
@@ -149,7 +149,7 @@ asmlinkage long sys_access_forbidden_zone_check(int lock_od, lt_t fz_len, lt_t p
         return err;
 }
 
-asmlinkage long sys_exit_forbidden_zone(int lock_od)
+asmlinkage long sys_cancel_watchdog(int lock_od)
 {
         long err = -EINVAL;
         struct od_table_entry* entry;
@@ -164,7 +164,7 @@ asmlinkage long sys_exit_forbidden_zone(int lock_od)
         if (entry && is_lock(entry)) {
                 l = get_lock(entry);
                 TRACE_CUR("exiting forbidden zone 0x%p\n", l);
-                err = l->ops->exit_forbidden_zone(l);
+                err = l->ops->cancel_watchdog(l);
         }
         TS_FZ_EXIT_END;
 
@@ -267,7 +267,7 @@ asmlinkage long sys_forbidden_zone_start(int sem_od)
         return -ENOSYS;
 }
 
-asmlinkage long sys_exit_forbidden_zone(int sem_od)
+asmlinkage long sys_cancel_watchdog(int sem_od)
 {
         return -ENOSYS;
 }
diff --git a/litmus/reservations/gedf_reservation.c b/litmus/reservations/gedf_reservation.c
index 536bedbd852a..41a4feeb6680 100644
--- a/litmus/reservations/gedf_reservation.c
+++ b/litmus/reservations/gedf_reservation.c
@@ -1312,7 +1312,7 @@ static int gedf_env_omlp_access_fz_check(struct litmus_lock* l, lt_t fz_len, lt_
         return 0;
 }
 
-static int gedf_env_omlp_exit_fz(struct litmus_lock* l)
+static int gedf_env_omlp_cancel_watchdog(struct litmus_lock* l)
 {
         struct task_struct* t = current;
         struct omlp_semaphore *sem = omlp_from_lock(l);
@@ -1503,7 +1503,7 @@ static struct litmus_lock_ops gedf_env_omlp_lock_ops = {
         .lock                        = gedf_env_omlp_lock,
         .lock_cs                                         = gedf_env_omlp_lock_cs,
         .access_forbidden_zone_check = gedf_env_omlp_access_fz_check,
-        .exit_forbidden_zone             = gedf_env_omlp_exit_fz,
+        .cancel_watchdog                         = gedf_env_omlp_cancel_watchdog,
         .unlock                      = gedf_env_omlp_unlock,
         .deallocate                  = gedf_env_omlp_free,
 };