lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lockd: bring a few function declarations up to date

Browse Source 
Clean-up: replace  __inline__ and use up-to-date function declaration
conventions.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
Chuck Lever
2008-03-14 14:18:45 -04:00
committed by Trond Myklebust
parent eb18860e13
commit f34ec991ae
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/linux/lockd/lockd.h
View File

@@ -219,8 +219,7 @@ void nlmsvc_mark_resources(void);
void nlmsvc_free_host_resources(struct nlm_host *); void nlmsvc_free_host_resources(struct nlm_host *);
void nlmsvc_invalidate_all(void); void nlmsvc_invalidate_all(void);
static __inline__ struct inode * static inline struct inode *nlmsvc_file_inode(struct nlm_file *file)
nlmsvc_file_inode(struct nlm_file *file)
{ {
return file->f_file->f_path.dentry->d_inode; return file->f_file->f_path.dentry->d_inode;
} }
@@ -228,8 +227,8 @@ nlmsvc_file_inode(struct nlm_file *file)
/* /*
* Compare two host addresses (needs modifying for ipv6) * Compare two host addresses (needs modifying for ipv6)
*/ */
static __inline__ int static inline int nlm_cmp_addr(const struct sockaddr_in *sin1,
nlm_cmp_addr(const struct sockaddr_in *sin1, const struct sockaddr_in *sin2) const struct sockaddr_in *sin2)
{ {
return sin1->sin_addr.s_addr == sin2->sin_addr.s_addr; return sin1->sin_addr.s_addr == sin2->sin_addr.s_addr;
} }
@@ -238,8 +237,8 @@ nlm_cmp_addr(const struct sockaddr_in *sin1, const struct sockaddr_in *sin2)
* Compare two NLM locks. * Compare two NLM locks.
* When the second lock is of type F_UNLCK, this acts like a wildcard. * When the second lock is of type F_UNLCK, this acts like a wildcard.
*/ */
static __inline__ int static inline int nlm_compare_locks(const struct file_lock *fl1,
nlm_compare_locks(const struct file_lock *fl1, const struct file_lock *fl2) const struct file_lock *fl2)
{ {
return fl1->fl_pid == fl2->fl_pid return fl1->fl_pid == fl2->fl_pid
&& fl1->fl_owner == fl2->fl_owner && fl1->fl_owner == fl2->fl_owner