Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 17045
b: refs/heads/master
c: 33443c4
h: refs/heads/master
i:
  17043: 1f4315c
v: v3
  • Loading branch information
Matt Mackall authored and Linus Torvalds committed Jan 9, 2006
1 parent f142f83 commit f59de15
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 5d2bea4582d20cb24085152acaa29b95c05cdcf8
refs/heads/master: 33443c42f4ffa5ca23b3323234bcb1a78e85d9db
7 changes: 3 additions & 4 deletions trunk/fs/locks.c
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ static struct file_lock *locks_alloc_lock(void)
}

/* Free a lock which is not in use. */
static inline void locks_free_lock(struct file_lock *fl)
static void locks_free_lock(struct file_lock *fl)
{
if (fl == NULL) {
BUG();
Expand Down Expand Up @@ -475,8 +475,7 @@ static inline int locks_overlap(struct file_lock *fl1, struct file_lock *fl2)
/*
* Check whether two locks have the same owner.
*/
static inline int
posix_same_owner(struct file_lock *fl1, struct file_lock *fl2)
static int posix_same_owner(struct file_lock *fl1, struct file_lock *fl2)
{
if (fl1->fl_lmops && fl1->fl_lmops->fl_compare_owner)
return fl2->fl_lmops == fl1->fl_lmops &&
Expand All @@ -487,7 +486,7 @@ posix_same_owner(struct file_lock *fl1, struct file_lock *fl2)
/* Remove waiter from blocker's block list.
* When blocker ends up pointing to itself then the list is empty.
*/
static inline void __locks_delete_block(struct file_lock *waiter)
static void __locks_delete_block(struct file_lock *waiter)
{
list_del_init(&waiter->fl_block);
list_del_init(&waiter->fl_link);
Expand Down

0 comments on commit f59de15

Please sign in to comment.