diff options
author | Jeff Layton <jlayton@primarydata.com> | 2014-08-22 10:40:25 -0400 |
---|---|---|
committer | Jeff Layton <jlayton@primarydata.com> | 2014-10-07 14:06:12 -0400 |
commit | e6f5c78930e409f3a6b37f5484313a416359ac7f (patch) | |
tree | e5465ac34a9251be44276f135c8a4f0a5ba4d42e /Documentation/filesystems | |
parent | 0c637be884f5eaa0ee53396ea7686ec0de03d126 (diff) |
locks: plumb a "priv" pointer into the setlease routines
In later patches, we're going to add a new lock_manager_operation to
finish setting up the lease while still holding the i_lock. To do
this, we'll need to pass a little bit of info in the fcntl setlease
case (primarily an fasync structure). Plumb the extra pointer into
there in advance of that.
We declare this pointer as a void ** to make it clear that this is
private info, and that the caller isn't required to set this unless
the lm_setup specifically requires it.
Signed-off-by: Jeff Layton <jlayton@primarydata.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'Documentation/filesystems')
-rw-r--r-- | Documentation/filesystems/Locking | 2 | ||||
-rw-r--r-- | Documentation/filesystems/vfs.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/filesystems/Locking b/Documentation/filesystems/Locking index f1997e9da61f..3d92049ae71d 100644 --- a/Documentation/filesystems/Locking +++ b/Documentation/filesystems/Locking | |||
@@ -464,7 +464,7 @@ prototypes: | |||
464 | size_t, unsigned int); | 464 | size_t, unsigned int); |
465 | ssize_t (*splice_read)(struct file *, loff_t *, struct pipe_inode_info *, | 465 | ssize_t (*splice_read)(struct file *, loff_t *, struct pipe_inode_info *, |
466 | size_t, unsigned int); | 466 | size_t, unsigned int); |
467 | int (*setlease)(struct file *, long, struct file_lock **); | 467 | int (*setlease)(struct file *, long, struct file_lock **, void **); |
468 | long (*fallocate)(struct file *, int, loff_t, loff_t); | 468 | long (*fallocate)(struct file *, int, loff_t, loff_t); |
469 | }; | 469 | }; |
470 | 470 | ||
diff --git a/Documentation/filesystems/vfs.txt b/Documentation/filesystems/vfs.txt index 61d65cc65c54..28ebd49f169f 100644 --- a/Documentation/filesystems/vfs.txt +++ b/Documentation/filesystems/vfs.txt | |||
@@ -826,7 +826,7 @@ struct file_operations { | |||
826 | int (*flock) (struct file *, int, struct file_lock *); | 826 | int (*flock) (struct file *, int, struct file_lock *); |
827 | ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, size_t, unsigned int); | 827 | ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, size_t, unsigned int); |
828 | ssize_t (*splice_read)(struct file *, struct pipe_inode_info *, size_t, unsigned int); | 828 | ssize_t (*splice_read)(struct file *, struct pipe_inode_info *, size_t, unsigned int); |
829 | int (*setlease)(struct file *, long arg, struct file_lock **); | 829 | int (*setlease)(struct file *, long arg, struct file_lock **, void **); |
830 | long (*fallocate)(struct file *, int mode, loff_t offset, loff_t len); | 830 | long (*fallocate)(struct file *, int mode, loff_t offset, loff_t len); |
831 | int (*show_fdinfo)(struct seq_file *m, struct file *f); | 831 | int (*show_fdinfo)(struct seq_file *m, struct file *f); |
832 | }; | 832 | }; |