diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2011-07-20 20:21:59 -0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2011-07-20 20:23:19 -0400 |
| commit | 8fb47a4fbf858a164e973b8ea8ef5e83e61f2e50 (patch) | |
| tree | d3b55fbce0e7ba5708a55b91b1ab4079ad192db6 /include | |
| parent | c46556c6be057da79f51b1a8325ec4c27938bd49 (diff) | |
| download | linux-8fb47a4fbf858a164e973b8ea8ef5e83e61f2e50.tar.bz2 | |
locks: rename lock-manager ops
Both the filesystem and the lock manager can associate operations with a
lock. Confusingly, one of them (fl_release_private) actually has the
same name in both operation structures.
It would save some confusion to give the lock-manager ops different
names.
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/fs.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index b5b979247863..cf719beb2016 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -1069,12 +1069,12 @@ struct file_lock_operations { }; struct lock_manager_operations { - int (*fl_compare_owner)(struct file_lock *, struct file_lock *); - void (*fl_notify)(struct file_lock *); /* unblock callback */ - int (*fl_grant)(struct file_lock *, struct file_lock *, int); - void (*fl_release_private)(struct file_lock *); - void (*fl_break)(struct file_lock *); - int (*fl_change)(struct file_lock **, int); + int (*lm_compare_owner)(struct file_lock *, struct file_lock *); + void (*lm_notify)(struct file_lock *); /* unblock callback */ + int (*lm_grant)(struct file_lock *, struct file_lock *, int); + void (*lm_release_private)(struct file_lock *); + void (*lm_break)(struct file_lock *); + int (*lm_change)(struct file_lock **, int); }; struct lock_manager { |