forked from ~ljy/RK356X_SDK_RELEASE

blame | history | patch | commit | commitdiff
hc
2023-11-20 520ec20d74dfd87f62fd58b921b7209d6daed94a 
 kernel/fs/locks.c
....@@ -936,7 +936,7 @@
936936 			return -ENOMEM;
937937 	}
938938 
939
-	percpu_down_read_preempt_disable(&file_rwsem);
939
+	percpu_down_read(&file_rwsem);
940940 	spin_lock(&ctx->flc_lock);
941941 	if (request->fl_flags & FL_ACCESS)
942942 		goto find_conflict;
....@@ -977,7 +977,7 @@
977977 
978978 out:
979979 	spin_unlock(&ctx->flc_lock);
980
-	percpu_up_read_preempt_enable(&file_rwsem);
980
+	percpu_up_read(&file_rwsem);
981981 	if (new_fl)
982982 		locks_free_lock(new_fl);
983983 	locks_dispose_list(&dispose);
....@@ -1015,7 +1015,7 @@
10151015 		new_fl2 = locks_alloc_lock();
10161016 	}
10171017 
1018
-	percpu_down_read_preempt_disable(&file_rwsem);
1018
+	percpu_down_read(&file_rwsem);
10191019 	spin_lock(&ctx->flc_lock);
10201020 	/*
10211021 	 * New lock request. Walk all POSIX locks and look for conflicts. If
....@@ -1187,7 +1187,7 @@
11871187 	}
11881188  out:
11891189 	spin_unlock(&ctx->flc_lock);
1190
-	percpu_up_read_preempt_enable(&file_rwsem);
1190
+	percpu_up_read(&file_rwsem);
11911191 	/*
11921192 	 * Free any unused locks.
11931193 	 */
....@@ -1462,7 +1462,7 @@
14621462 		return error;
14631463 	}
14641464 
1465
-	percpu_down_read_preempt_disable(&file_rwsem);
1465
+	percpu_down_read(&file_rwsem);
14661466 	spin_lock(&ctx->flc_lock);
14671467 
14681468 	time_out_leases(inode, &dispose);
....@@ -1514,13 +1514,13 @@
15141514 	locks_insert_block(fl, new_fl);
15151515 	trace_break_lease_block(inode, new_fl);
15161516 	spin_unlock(&ctx->flc_lock);
1517
-	percpu_up_read_preempt_enable(&file_rwsem);
1517
+	percpu_up_read(&file_rwsem);
15181518 
15191519 	locks_dispose_list(&dispose);
15201520 	error = wait_event_interruptible_timeout(new_fl->fl_wait,
15211521 						!new_fl->fl_next, break_time);
15221522 
1523
-	percpu_down_read_preempt_disable(&file_rwsem);
1523
+	percpu_down_read(&file_rwsem);
15241524 	spin_lock(&ctx->flc_lock);
15251525 	trace_break_lease_unblock(inode, new_fl);
15261526 	locks_delete_block(new_fl);
....@@ -1537,7 +1537,7 @@
15371537 	}
15381538 out:
15391539 	spin_unlock(&ctx->flc_lock);
1540
-	percpu_up_read_preempt_enable(&file_rwsem);
1540
+	percpu_up_read(&file_rwsem);
15411541 	locks_dispose_list(&dispose);
15421542 	locks_free_lock(new_fl);
15431543 	return error;
....@@ -1609,7 +1609,7 @@
16091609 
16101610 	ctx = smp_load_acquire(&inode->i_flctx);
16111611 	if (ctx && !list_empty_careful(&ctx->flc_lease)) {
1612
-		percpu_down_read_preempt_disable(&file_rwsem);
1612
+		percpu_down_read(&file_rwsem);
16131613 		spin_lock(&ctx->flc_lock);
16141614 		time_out_leases(inode, &dispose);
16151615 		list_for_each_entry(fl, &ctx->flc_lease, fl_list) {
....@@ -1619,7 +1619,7 @@
16191619 			break;
16201620 		}
16211621 		spin_unlock(&ctx->flc_lock);
1622
-		percpu_up_read_preempt_enable(&file_rwsem);
1622
+		percpu_up_read(&file_rwsem);
16231623 
16241624 		locks_dispose_list(&dispose);
16251625 	}
....@@ -1693,7 +1693,7 @@
16931693 		return -EINVAL;
16941694 	}
16951695 
1696
-	percpu_down_read_preempt_disable(&file_rwsem);
1696
+	percpu_down_read(&file_rwsem);
16971697 	spin_lock(&ctx->flc_lock);
16981698 	time_out_leases(inode, &dispose);
16991699 	error = check_conflicting_open(dentry, arg, lease->fl_flags);
....@@ -1764,7 +1764,7 @@
17641764 		lease->fl_lmops->lm_setup(lease, priv);
17651765 out:
17661766 	spin_unlock(&ctx->flc_lock);
1767
-	percpu_up_read_preempt_enable(&file_rwsem);
1767
+	percpu_up_read(&file_rwsem);
17681768 	locks_dispose_list(&dispose);
17691769 	if (is_deleg)
17701770 		inode_unlock(inode);
....@@ -1787,7 +1787,7 @@
17871787 		return error;
17881788 	}
17891789 
1790
-	percpu_down_read_preempt_disable(&file_rwsem);
1790
+	percpu_down_read(&file_rwsem);
17911791 	spin_lock(&ctx->flc_lock);
17921792 	list_for_each_entry(fl, &ctx->flc_lease, fl_list) {
17931793 		if (fl->fl_file == filp &&
....@@ -1800,7 +1800,7 @@
18001800 	if (victim)
18011801 		error = fl->fl_lmops->lm_change(victim, F_UNLCK, &dispose);
18021802 	spin_unlock(&ctx->flc_lock);
1803
-	percpu_up_read_preempt_enable(&file_rwsem);
1803
+	percpu_up_read(&file_rwsem);
18041804 	locks_dispose_list(&dispose);
18051805 	return error;
18061806 }
....@@ -2531,13 +2531,13 @@
25312531 	if (list_empty(&ctx->flc_lease))
25322532 		return;
25332533 
2534
-	percpu_down_read_preempt_disable(&file_rwsem);
2534
+	percpu_down_read(&file_rwsem);
25352535 	spin_lock(&ctx->flc_lock);
25362536 	list_for_each_entry_safe(fl, tmp, &ctx->flc_lease, fl_list)
25372537 		if (filp == fl->fl_file)
25382538 			lease_modify(fl, F_UNLCK, &dispose);
25392539 	spin_unlock(&ctx->flc_lock);
2540
-	percpu_up_read_preempt_enable(&file_rwsem);
2540
+	percpu_up_read(&file_rwsem);
25412541 
25422542 	locks_dispose_list(&dispose);
25432543 }