diff options
| -rw-r--r-- | fs/locks.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/fs/locks.c b/fs/locks.c index fe8f9f46445b..90b652ad306f 100644 --- a/fs/locks.c +++ b/fs/locks.c | |||
| @@ -901,16 +901,6 @@ static int flock_lock_file(struct file *filp, struct file_lock *request) | |||
| 901 | goto out; | 901 | goto out; |
| 902 | } | 902 | } |
| 903 | 903 | ||
| 904 | /* | ||
| 905 | * If a higher-priority process was blocked on the old file lock, | ||
| 906 | * give it the opportunity to lock the file. | ||
| 907 | */ | ||
| 908 | if (found) { | ||
| 909 | spin_unlock(&ctx->flc_lock); | ||
| 910 | cond_resched(); | ||
| 911 | spin_lock(&ctx->flc_lock); | ||
| 912 | } | ||
| 913 | |||
| 914 | find_conflict: | 904 | find_conflict: |
| 915 | list_for_each_entry(fl, &ctx->flc_flock, fl_list) { | 905 | list_for_each_entry(fl, &ctx->flc_flock, fl_list) { |
| 916 | if (!flock_locks_conflict(request, fl)) | 906 | if (!flock_locks_conflict(request, fl)) |
