diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-06-05 04:52:00 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-06-05 04:52:00 +0300 |
| commit | dbe0ee46614016146c1b3e1fc063b44333bb2401 (patch) | |
| tree | d575d487d306a8f03cceac3f930d7fd53a6079f8 /include/linux/fs.h | |
| parent | d66016c5cd3d4c474cd24622c511dcd358645613 (diff) | |
| parent | 6319194ec57b0452dcda4589d24c4e7db299c5bf (diff) | |
| download | linux-dbe0ee46614016146c1b3e1fc063b44333bb2401.tar.xz | |
Merge tag 'pull-18-rc1-work.fd' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull file descriptor updates from Al Viro.
- Descriptor handling cleanups
* tag 'pull-18-rc1-work.fd' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
Unify the primitives for file descriptor closing
fs: remove fget_many and fput_many interface
io_uring_enter(): don't leave f.flags uninitialized
Diffstat (limited to 'include/linux/fs.h')
| -rw-r--r-- | include/linux/fs.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index 01403e637271..d5ae3f3767b2 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -974,9 +974,7 @@ static inline struct file *get_file(struct file *f) atomic_long_inc(&f->f_count); return 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 get_file_rcu(x) atomic_long_inc_not_zero(&(x)->f_count) #define file_count(x) atomic_long_read(&(x)->f_count) #define MAX_NON_LFS ((1UL<<31) - 1) |