diff options
| author | Jeff Layton <jlayton@primarydata.com> | 2015-01-16 15:05:57 -0500 |
|---|---|---|
| committer | Jeff Layton <jeff.layton@primarydata.com> | 2015-01-16 16:08:50 -0500 |
| commit | 7448cc37b1a6b620d948aaee3bb30960c06d5d5d (patch) | |
| tree | ad3db19117c9f7c6ac28e3be759ade949359c55a /include/linux | |
| parent | 6109c85037e53443f29fd39c0de69f578a1cf285 (diff) | |
locks: clean up the lm_change prototype
Now that we use standard list_heads for tracking leases, we can have
lm_change take a pointer to the lease to be modified instead of a
double pointer.
Signed-off-by: Jeff Layton <jlayton@primarydata.com>
Acked-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/fs.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index 32eafa9b5c9f..94e706a0a408 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h | |||
| @@ -900,7 +900,7 @@ struct lock_manager_operations { | |||
| 900 | void (*lm_notify)(struct file_lock *); /* unblock callback */ | 900 | void (*lm_notify)(struct file_lock *); /* unblock callback */ |
| 901 | int (*lm_grant)(struct file_lock *, int); | 901 | int (*lm_grant)(struct file_lock *, int); |
| 902 | bool (*lm_break)(struct file_lock *); | 902 | bool (*lm_break)(struct file_lock *); |
| 903 | int (*lm_change)(struct file_lock **, int, struct list_head *); | 903 | int (*lm_change)(struct file_lock *, int, struct list_head *); |
| 904 | void (*lm_setup)(struct file_lock *, void **); | 904 | void (*lm_setup)(struct file_lock *, void **); |
| 905 | }; | 905 | }; |
| 906 | 906 | ||
| @@ -1021,7 +1021,7 @@ extern int __break_lease(struct inode *inode, unsigned int flags, unsigned int t | |||
| 1021 | extern void lease_get_mtime(struct inode *, struct timespec *time); | 1021 | extern void lease_get_mtime(struct inode *, struct timespec *time); |
| 1022 | extern int generic_setlease(struct file *, long, struct file_lock **, void **priv); | 1022 | extern int generic_setlease(struct file *, long, struct file_lock **, void **priv); |
| 1023 | extern int vfs_setlease(struct file *, long, struct file_lock **, void **); | 1023 | extern int vfs_setlease(struct file *, long, struct file_lock **, void **); |
| 1024 | extern int lease_modify(struct file_lock **, int, struct list_head *); | 1024 | extern int lease_modify(struct file_lock *, int, struct list_head *); |
| 1025 | #else /* !CONFIG_FILE_LOCKING */ | 1025 | #else /* !CONFIG_FILE_LOCKING */ |
| 1026 | static inline int fcntl_getlk(struct file *file, unsigned int cmd, | 1026 | static inline int fcntl_getlk(struct file *file, unsigned int cmd, |
| 1027 | struct flock __user *user) | 1027 | struct flock __user *user) |
| @@ -1153,7 +1153,7 @@ static inline int vfs_setlease(struct file *filp, long arg, | |||
| 1153 | return -EINVAL; | 1153 | return -EINVAL; |
| 1154 | } | 1154 | } |
| 1155 | 1155 | ||
| 1156 | static inline int lease_modify(struct file_lock **before, int arg, | 1156 | static inline int lease_modify(struct file_lock *fl, int arg, |
| 1157 | struct list_head *dispose) | 1157 | struct list_head *dispose) |
| 1158 | { | 1158 | { |
| 1159 | return -EINVAL; | 1159 | return -EINVAL; |
