Merge tag 'locks-v4.1-1' of git://git.samba.org/jlayton/linux

[linux-2.6-block.git] / include / linux / fs.h

diff --git a/include/linux/fs.h b/include/linux/fs.h
index 4d9acc91de12c24f3f0308a1aefea6888ca0648c..90a1207231eaeffa7f59de6c13122a6a9f5d6237 100644 (file)
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -915,8 +915,8 @@ struct file_lock_operations {
 struct lock_manager_operations {
        int (*lm_compare_owner)(struct file_lock *, struct file_lock *);
        unsigned long (*lm_owner_key)(struct file_lock *);
-       void (*lm_get_owner)(struct file_lock *, struct file_lock *);
-       void (*lm_put_owner)(struct file_lock *);
+       fl_owner_t (*lm_get_owner)(fl_owner_t);
+       void (*lm_put_owner)(fl_owner_t);
        void (*lm_notify)(struct file_lock *);  /* unblock callback */
        int (*lm_grant)(struct file_lock *, int);
        bool (*lm_break)(struct file_lock *);