Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

[platform/adaptation/renesas_rcar/renesas_kernel.git] / include / linux / fs.h

diff --git a/include/linux/fs.h b/include/linux/fs.h
index fb21903..08824e0 100644 (file)
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1066,7 +1066,6 @@ struct lock_manager_operations {
        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_mylease)(struct file_lock *, struct file_lock *);
        int (*fl_change)(struct file_lock **, int);
 };