mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 10:40:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

lockd: posix_test_lock() should not call locks_copy_lock()

Browse source 
The caller of posix_test_lock() should never need to look at the lock
private data, so do not copy that information. This also means that there
is no need to call the fl_release_private methods.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
Trond Myklebust 2006-03-20 13:44:38 -05:00
parent 3feb2d4939
commit 0996905f93
1 changed files with 13 additions and 5 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

18
fs/locks.c
View file

@ -239,17 +239,25 @@ static void locks_copy_private(struct file_lock *new, struct file_lock *fl)
/* /*
* Initialize a new lock from an existing file_lock structure. * Initialize a new lock from an existing file_lock structure.
*/ */
void locks_copy_lock(struct file_lock *new, struct file_lock *fl) static void __locks_copy_lock(struct file_lock *new, const struct file_lock *fl)
{ {
locks_release_private(new);
new->fl_owner = fl->fl_owner; new->fl_owner = fl->fl_owner;
new->fl_pid = fl->fl_pid; new->fl_pid = fl->fl_pid;
new->fl_file = fl->fl_file; new->fl_file = NULL;
new->fl_flags = fl->fl_flags; new->fl_flags = fl->fl_flags;
new->fl_type = fl->fl_type; new->fl_type = fl->fl_type;
new->fl_start = fl->fl_start; new->fl_start = fl->fl_start;
new->fl_end = fl->fl_end; new->fl_end = fl->fl_end;
new->fl_ops = NULL;
new->fl_lmops = NULL;
}
void locks_copy_lock(struct file_lock *new, struct file_lock *fl)
{
locks_release_private(new);
__locks_copy_lock(new, fl);
new->fl_file = fl->fl_file;
new->fl_ops = fl->fl_ops; new->fl_ops = fl->fl_ops;
new->fl_lmops = fl->fl_lmops; new->fl_lmops = fl->fl_lmops;
@ -686,7 +694,7 @@ posix_test_lock(struct file *filp, struct file_lock *fl,
break; break;
} }
if (cfl) { if (cfl) {
locks_copy_lock(conflock, cfl); __locks_copy_lock(conflock, cfl);
unlock_kernel(); unlock_kernel();
return 1; return 1;
} }