X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fptlrpc%2Fsec.c;fp=lustre%2Fptlrpc%2Fsec.c;h=79237a051c160e52c5dd39a8c853bda718d30aec;hb=1bb6ce8d8cc4de97d49ab5f1d8a07b60e3dc3639;hp=77e62fbc9d4cee662ff28769965edc64113f85be;hpb=fb403f8b5f8ba61fe0da28e7f7c5e01776717750;p=fs%2Flustre-release.git

diff --git a/lustre/ptlrpc/sec.c b/lustre/ptlrpc/sec.c
index 77e62fb..79237a0 100644
--- a/lustre/ptlrpc/sec.c
+++ b/lustre/ptlrpc/sec.c
@@ -364,7 +364,7 @@ static int import_sec_check_expire(struct obd_import *imp)
 
 	spin_lock(&imp->imp_lock);
 	if (imp->imp_sec_expire &&
-	    imp->imp_sec_expire < cfs_time_current_sec()) {
+	    imp->imp_sec_expire < ktime_get_real_seconds()) {
 		adapt = 1;
 		imp->imp_sec_expire = 0;
 	}
@@ -1806,7 +1806,7 @@ int sptlrpc_target_export_check(struct obd_export *exp,
                 exp->exp_flvr_old[1] = exp->exp_flvr_old[0];
                 exp->exp_flvr_expire[1] = exp->exp_flvr_expire[0];
                 exp->exp_flvr_old[0] = exp->exp_flvr;
-                exp->exp_flvr_expire[0] = cfs_time_current_sec() +
+		exp->exp_flvr_expire[0] = ktime_get_real_seconds() +
                                           EXP_FLVR_UPDATE_EXPIRE;
                 exp->exp_flvr = flavor;
 
@@ -1880,15 +1880,14 @@ int sptlrpc_target_export_check(struct obd_export *exp,
         }
 
         if (exp->exp_flvr_expire[0]) {
-                if (exp->exp_flvr_expire[0] >= cfs_time_current_sec()) {
+		if (exp->exp_flvr_expire[0] >= ktime_get_real_seconds()) {
                         if (flavor_allowed(&exp->exp_flvr_old[0], req)) {
-                                CDEBUG(D_SEC, "exp %p (%x|%x|%x): match the "
-                                       "middle one ("CFS_DURATION_T")\n", exp,
+				CDEBUG(D_SEC, "exp %p (%x|%x|%x): match the middle one (%lld)\n", exp,
                                        exp->exp_flvr.sf_rpc,
                                        exp->exp_flvr_old[0].sf_rpc,
                                        exp->exp_flvr_old[1].sf_rpc,
-                                       exp->exp_flvr_expire[0] -
-                                                cfs_time_current_sec());
+				       (s64)(exp->exp_flvr_expire[0] -
+				       ktime_get_real_seconds()));
 				spin_unlock(&exp->exp_lock);
                                 return 0;
                         }
@@ -1905,15 +1904,15 @@ int sptlrpc_target_export_check(struct obd_export *exp,
         /* now it doesn't match the current flavor, the only chance we can
          * accept it is match the old flavors which is not expired. */
         if (exp->exp_flvr_changed == 0 && exp->exp_flvr_expire[1]) {
-                if (exp->exp_flvr_expire[1] >= cfs_time_current_sec()) {
+		if (exp->exp_flvr_expire[1] >= ktime_get_real_seconds()) {
                         if (flavor_allowed(&exp->exp_flvr_old[1], req)) {
-                                CDEBUG(D_SEC, "exp %p (%x|%x|%x): match the "
-                                       "oldest one ("CFS_DURATION_T")\n", exp,
+				CDEBUG(D_SEC, "exp %p (%x|%x|%x): match the oldest one (%lld)\n",
+				       exp,
                                        exp->exp_flvr.sf_rpc,
                                        exp->exp_flvr_old[0].sf_rpc,
                                        exp->exp_flvr_old[1].sf_rpc,
-                                       exp->exp_flvr_expire[1] -
-                                                cfs_time_current_sec());
+				       (s64)(exp->exp_flvr_expire[1] -
+				       ktime_get_real_seconds()));
 				spin_unlock(&exp->exp_lock);
                                 return 0;
                         }
@@ -1933,8 +1932,7 @@ int sptlrpc_target_export_check(struct obd_export *exp,
 
 	spin_unlock(&exp->exp_lock);
 
-        CWARN("exp %p(%s): req %p (%u|%u|%u|%u|%u|%u) with "
-              "unauthorized flavor %x, expect %x|%x(%+ld)|%x(%+ld)\n",
+	CWARN("exp %p(%s): req %p (%u|%u|%u|%u|%u|%u) with unauthorized flavor %x, expect %x|%x(%+lld)|%x(%+lld)\n",
               exp, exp->exp_obd->obd_name,
               req, req->rq_auth_gss, req->rq_ctx_init, req->rq_ctx_fini,
               req->rq_auth_usr_root, req->rq_auth_usr_mdt, req->rq_auth_usr_ost,
@@ -1942,12 +1940,10 @@ int sptlrpc_target_export_check(struct obd_export *exp,
               exp->exp_flvr.sf_rpc,
               exp->exp_flvr_old[0].sf_rpc,
               exp->exp_flvr_expire[0] ?
-              (unsigned long) (exp->exp_flvr_expire[0] -
-                               cfs_time_current_sec()) : 0,
+	      (s64)(exp->exp_flvr_expire[0] - ktime_get_real_seconds()) : 0,
               exp->exp_flvr_old[1].sf_rpc,
               exp->exp_flvr_expire[1] ?
-              (unsigned long) (exp->exp_flvr_expire[1] -
-                               cfs_time_current_sec()) : 0);
+	      (s64)(exp->exp_flvr_expire[1] - ktime_get_real_seconds()) : 0);
         return -EACCES;
 }
 EXPORT_SYMBOL(sptlrpc_target_export_check);