diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-05-21 22:00:02 +0100 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-05-21 22:00:02 +0100 |
| commit | 67394f8f069c2fdf90f3b6d851824c07815442af (patch) | |
| tree | 0c33e62d34dbaecea434ae9ece3cc0c56db8b1f7 /fs/locks.c | |
| parent | 450cbfbbbd88876e3ccec1d277f613221ca82bb7 (diff) | |
| parent | 9636273dae265b9354b861b373cd43cd76a6d0fe (diff) | |
Merge with /usr/src/ntfs-2.6.git
Diffstat (limited to 'fs/locks.c')
| -rw-r--r-- | fs/locks.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/locks.c b/fs/locks.c index 1792ce547af7..3fa6a7ce57a7 100644 --- a/fs/locks.c +++ b/fs/locks.c @@ -406,12 +406,12 @@ static void lease_release_private_callback(struct file_lock *fl) fl->fl_file->f_owner.signum = 0; } -int lease_mylease_callback(struct file_lock *fl, struct file_lock *try) +static int lease_mylease_callback(struct file_lock *fl, struct file_lock *try) { return fl->fl_file == try->fl_file; } -struct lock_manager_operations lease_manager_ops = { +static struct lock_manager_operations lease_manager_ops = { .fl_break = lease_break_callback, .fl_release_private = lease_release_private_callback, .fl_mylease = lease_mylease_callback, @@ -1274,7 +1274,7 @@ int fcntl_getlease(struct file *filp) * * Called with kernel lock held. */ -int __setlease(struct file *filp, long arg, struct file_lock **flp) +static int __setlease(struct file *filp, long arg, struct file_lock **flp) { struct file_lock *fl, **before, **my_before = NULL, *lease = *flp; struct dentry *dentry = filp->f_dentry; |