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
Showing the changes to include/linux (1 of 5 files). Show all
Unified · Split
| @@ -975,7 +975,6 @@ static inline struct file *get_file(struct file *f) · 974 unmodified lines | |||
| 975 | #define get_file_rcu_many(x, cnt) \ | 975 | #define get_file_rcu_many(x, cnt) \ |
| 976 | atomic_long_add_unless(&(x)->f_count, (cnt), 0) | 976 | atomic_long_add_unless(&(x)->f_count, (cnt), 0) |
| 977 | #define get_file_rcu(x) get_file_rcu_many((x), 1) | 977 | #define get_file_rcu(x) get_file_rcu_many((x), 1) |
| 978 | #define fput_atomic(x) atomic_long_add_unless(&(x)->f_count, -1, 1) | ||
| 979 | #define file_count(x) atomic_long_read(&(x)->f_count) | 978 | #define file_count(x) atomic_long_read(&(x)->f_count) |
| 980 | 979 | ||
| 981 | #define MAX_NON_LFS ((1UL<<31) - 1) | 980 | #define MAX_NON_LFS ((1UL<<31) - 1) |