diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-04 10:03:10 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-04 10:03:10 -0700 |
| commit | 1bff598860f535e525c2a549f7f584ae7cc3fc1c (patch) | |
| tree | e6c344e59b6434788a5111d86bf181397d2b6c16 /include | |
| parent | 3e7a716a92a0e051f5502c7b689f8c9127c37c33 (diff) | |
| parent | 73a8f5f7e6350766102fe8fb85048f7f8f0cb5f7 (diff) | |
Merge tag 'locks-v3.17-1' of git://git.samba.org/jlayton/linux
Pull file locking related changes from Jeff Layton:
"Just a couple of changes from Christoph to start us down the road
toward getting rid of the fl_owner_t typedef"
* tag 'locks-v3.17-1' of git://git.samba.org/jlayton/linux:
locks: purge fl_owner_t from fs/locks.c
locks: typedef fl_owner_t to void *
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/fs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index e11d60cc867b..2daccaf4b547 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -833,7 +833,7 @@ static inline struct file *get_file(struct file *f) * * Lockd stuffs a "host" pointer into this. */ -typedef struct files_struct *fl_owner_t; +typedef void *fl_owner_t; struct file_lock_operations { void (*fl_copy_lock)(struct file_lock *, struct file_lock *); |