In a future patch, we're going to split file leases into their own
structure. Since a lot of the underlying machinery uses the same fields
move those into a new file_lock_core, and embed that inside struct
file_lock.

Signed-off-by: Jeff Layton <jlay...@kernel.org>
---
 include/linux/filelock.h | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/include/linux/filelock.h b/include/linux/filelock.h
index 95e868e09e29..7825511c1c11 100644
--- a/include/linux/filelock.h
+++ b/include/linux/filelock.h
@@ -85,8 +85,9 @@ bool opens_in_grace(struct net *);
  *
  * Obviously, the last two criteria only matter for POSIX locks.
  */
-struct file_lock {
-       struct file_lock *fl_blocker;   /* The lock, that is blocking us */
+
+struct file_lock_core {
+       struct file_lock *fl_blocker;   /* The lock that is blocking us */
        struct list_head fl_list;       /* link into file_lock_context */
        struct hlist_node fl_link;      /* node in global lists */
        struct list_head fl_blocked_requests;   /* list of requests with
@@ -102,6 +103,10 @@ struct file_lock {
        int fl_link_cpu;                /* what cpu's list is this on? */
        wait_queue_head_t fl_wait;
        struct file *fl_file;
+};
+
+struct file_lock {
+       struct file_lock_core fl_core;
        loff_t fl_start;
        loff_t fl_end;
 

-- 
2.43.0


Reply via email to