diff options
Diffstat (limited to 'include/linux/lockd')
-rw-r--r-- | include/linux/lockd/lockd.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/lockd/lockd.h b/include/linux/lockd/lockd.h index f5a051a79273..dcaad79f54ed 100644 --- a/include/linux/lockd/lockd.h +++ b/include/linux/lockd/lockd.h | |||
@@ -212,7 +212,8 @@ int nlmclnt_block(struct nlm_wait *block, struct nlm_rqst *req, long timeout) | |||
212 | __be32 nlmclnt_grant(const struct sockaddr *addr, | 212 | __be32 nlmclnt_grant(const struct sockaddr *addr, |
213 | const struct nlm_lock *lock); | 213 | const struct nlm_lock *lock); |
214 | void nlmclnt_recovery(struct nlm_host *); | 214 | void nlmclnt_recovery(struct nlm_host *); |
215 | int nlmclnt_reclaim(struct nlm_host *, struct file_lock *); | 215 | int nlmclnt_reclaim(struct nlm_host *, struct file_lock *, |
216 | struct nlm_rqst *); | ||
216 | void nlmclnt_next_cookie(struct nlm_cookie *); | 217 | void nlmclnt_next_cookie(struct nlm_cookie *); |
217 | 218 | ||
218 | /* | 219 | /* |
@@ -291,7 +292,7 @@ int nlmsvc_unlock_all_by_ip(struct sockaddr *server_addr); | |||
291 | 292 | ||
292 | static inline struct inode *nlmsvc_file_inode(struct nlm_file *file) | 293 | static inline struct inode *nlmsvc_file_inode(struct nlm_file *file) |
293 | { | 294 | { |
294 | return file->f_file->f_path.dentry->d_inode; | 295 | return file_inode(file->f_file); |
295 | } | 296 | } |
296 | 297 | ||
297 | static inline int __nlm_privileged_request4(const struct sockaddr *sap) | 298 | static inline int __nlm_privileged_request4(const struct sockaddr *sap) |