diff options
author | Jeff Layton <jlayton@primarydata.com> | 2015-01-16 15:05:56 -0500 |
---|---|---|
committer | Jeff Layton <jeff.layton@primarydata.com> | 2015-01-16 16:08:49 -0500 |
commit | a7231a97467d5a0c36f82f581c76c12c034e4b80 (patch) | |
tree | d0b9936fde54adf4f2424943fec15fc3ddbca4b6 /include/linux/fs.h | |
parent | 8634b51f6ca298fb8b07aa4847340764903533ab (diff) |
locks: remove i_flock field from struct inode
Nothing uses it anymore. Also add a forward declaration for struct
file_lock to silence some compiler warnings that the removal triggers.
Signed-off-by: Jeff Layton <jlayton@primarydata.com>
Acked-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'include/linux/fs.h')
-rw-r--r-- | include/linux/fs.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index 2ddec3cf81b9..ce0873af0b97 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h | |||
@@ -625,7 +625,6 @@ struct inode { | |||
625 | atomic_t i_readcount; /* struct files open RO */ | 625 | atomic_t i_readcount; /* struct files open RO */ |
626 | #endif | 626 | #endif |
627 | const struct file_operations *i_fop; /* former ->i_op->default_file_ops */ | 627 | const struct file_operations *i_fop; /* former ->i_op->default_file_ops */ |
628 | struct file_lock *i_flock; | ||
629 | struct file_lock_context *i_flctx; | 628 | struct file_lock_context *i_flctx; |
630 | struct address_space i_data; | 629 | struct address_space i_data; |
631 | struct list_head i_devices; | 630 | struct list_head i_devices; |
@@ -886,6 +885,8 @@ static inline struct file *get_file(struct file *f) | |||
886 | /* legacy typedef, should eventually be removed */ | 885 | /* legacy typedef, should eventually be removed */ |
887 | typedef void *fl_owner_t; | 886 | typedef void *fl_owner_t; |
888 | 887 | ||
888 | struct file_lock; | ||
889 | |||
889 | struct file_lock_operations { | 890 | struct file_lock_operations { |
890 | void (*fl_copy_lock)(struct file_lock *, struct file_lock *); | 891 | void (*fl_copy_lock)(struct file_lock *, struct file_lock *); |
891 | void (*fl_release_private)(struct file_lock *); | 892 | void (*fl_release_private)(struct file_lock *); |