diff options
| author | Christian Brauner <brauner@kernel.org> | 2026-09-25 18:20:24 +0200 |
|---|---|---|
| committer | Christian Brauner <brauner@kernel.org> | 2026-09-25 18:20:24 +0200 |
| commit | cb70d8c361808b08d13dc4bdddb59cd92c48f84c (patch) | |
| tree | 21b668b9507a1803fc4b22dce67df458a3538551 /fs/xfs | |
| parent | 823aa1da86a3d06605dabd0f50af486dac614853 (diff) | |
| parent | fae37d5e3c4e94aef334825ab89f66efcfe489b2 (diff) | |
| download | linux-next-cb70d8c361808b08d13dc4bdddb59cd92c48f84c.tar.gz linux-next-cb70d8c361808b08d13dc4bdddb59cd92c48f84c.zip | |
Merge branch 'vfs-7.4.file' into vfs.all
Signed-off-by: Christian Brauner <brauner@kernel.org>
Diffstat (limited to 'fs/xfs')
| -rw-r--r-- | fs/xfs/xfs_handle.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/xfs/xfs_handle.c b/fs/xfs/xfs_handle.c index 0689cade8f74..303bcff64459 100644 --- a/fs/xfs/xfs_handle.c +++ b/fs/xfs/xfs_handle.c @@ -272,11 +272,11 @@ xfs_open_by_handle( path.mnt = mntget(parfilp->f_path.mnt); FD_PREPARE(fdf, 0, dentry_open(&path, hreq->oflags, cred)); - if (fdf.err) - return fdf.err; + if (fdf->fd < 0) + return fdf->fd; if (S_ISREG(inode->i_mode)) { - struct file *filp = fd_prepare_file(fdf); + struct file *filp = fdf->file; filp->f_flags |= O_NOATIME; filp->f_mode |= FMODE_NOCMTIME; |