diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-07 20:34:21 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-07 20:34:21 -0700 |
| commit | d897166d8598e362a31d79dfd9a1e2eedb9ac85c (patch) | |
| tree | eb799f89e18e8ae41605e9a7388c6ca9026b0e10 /include/linux | |
| parent | 400913252d09f9cfb8cce33daee43167921fc343 (diff) | |
| parent | 3b85d3028e2a0f95a8425fbfa54a04056b7cbc91 (diff) | |
Merge branch 'work.file' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull vfs 'struct file' related updates from Al Viro:
"A bit more of 'this fget() would be better off as fdget()'
whack-a-mole + a couple of ->f_count-related cleanups"
* 'work.file' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
media: switch to fdget()
drm_syncobj: switch to fdget()
amdgpu: switch to fdget()
don't open-code file_count()
fs: drop unused fput_atomic definition
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/fs.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index ec07f4c5630d..49d048ea0afb 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -975,7 +975,6 @@ static inline struct file *get_file(struct file *f) #define get_file_rcu_many(x, cnt) \ atomic_long_add_unless(&(x)->f_count, (cnt), 0) #define get_file_rcu(x) get_file_rcu_many((x), 1) -#define fput_atomic(x) atomic_long_add_unless(&(x)->f_count, -1, 1) #define file_count(x) atomic_long_read(&(x)->f_count) #define MAX_NON_LFS ((1UL<<31) - 1) |