diff options
| author | Linus Torvalds <[email protected]> | 2024-09-23 16:35:36 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2024-09-23 16:35:36 +0000 |
| commit | f8ffbc365f703d74ecca8ca787318d05bbee2bf7 (patch) | |
| tree | cdb3e023473e02a186b39fe541eb719ed2ffcb7f /fs/xfs/xfs_exchrange.c | |
| parent | mm: fix build on 32-bit targets without MAX_PHYSMEM_BITS (diff) | |
| parent | add struct fd constructors, get rid of __to_fd() (diff) | |
| download | kernel-f8ffbc365f703d74ecca8ca787318d05bbee2bf7.tar.gz kernel-f8ffbc365f703d74ecca8ca787318d05bbee2bf7.zip | |
Merge tag 'pull-stable-struct_fd' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull 'struct fd' updates from Al Viro:
"Just the 'struct fd' layout change, with conversion to accessor
helpers"
* tag 'pull-stable-struct_fd' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
add struct fd constructors, get rid of __to_fd()
struct fd: representation change
introduce fd_file(), convert all accessors to it.
Diffstat (limited to 'fs/xfs/xfs_exchrange.c')
| -rw-r--r-- | fs/xfs/xfs_exchrange.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/xfs/xfs_exchrange.c b/fs/xfs/xfs_exchrange.c index d0889190ab7f..75cb53f090d1 100644 --- a/fs/xfs/xfs_exchrange.c +++ b/fs/xfs/xfs_exchrange.c @@ -829,9 +829,9 @@ xfs_ioc_exchange_range( fxr.flags = args.flags; file1 = fdget(args.file1_fd); - if (!file1.file) + if (!fd_file(file1)) return -EBADF; - fxr.file1 = file1.file; + fxr.file1 = fd_file(file1); error = xfs_exchange_range(&fxr); fdput(file1); @@ -935,9 +935,9 @@ xfs_ioc_commit_range( fxr.file2_ctime.tv_nsec = kern_f->file2_ctime_nsec; file1 = fdget(args.file1_fd); - if (!file1.file) + if (fd_empty(file1)) return -EBADF; - fxr.file1 = file1.file; + fxr.file1 = fd_file(file1); error = xfs_exchange_range(&fxr); fdput(file1); |