diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2022-03-30 21:14:18 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2022-03-30 21:14:18 -0700 |
| commit | 5710faba8a2a15349c9001bd4b2cd958e56c90fa (patch) | |
| tree | 80694ac211cac1b2347c3c905b38d86139dc51c1 /fs/nfs/inode.c | |
| parent | 5600f6986628dde8881734090588474f54a540a8 (diff) | |
| parent | a949087c2285c8de4f0f204cab2d4eece9d929a2 (diff) | |
| download | lwn-5710faba8a2a15349c9001bd4b2cd958e56c90fa.tar.gz lwn-5710faba8a2a15349c9001bd4b2cd958e56c90fa.zip | |
Merge branch 'next' into for-linus
Prepare input updates for 5.18 merge window.
Diffstat (limited to 'fs/nfs/inode.c')
| -rw-r--r-- | fs/nfs/inode.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c index a918c3a834b6..d96baa4450e3 100644 --- a/fs/nfs/inode.c +++ b/fs/nfs/inode.c @@ -853,12 +853,9 @@ int nfs_getattr(struct user_namespace *mnt_userns, const struct path *path, } /* Flush out writes to the server in order to update c/mtime. */ - if ((request_mask & (STATX_CTIME|STATX_MTIME)) && - S_ISREG(inode->i_mode)) { - err = filemap_write_and_wait(inode->i_mapping); - if (err) - goto out; - } + if ((request_mask & (STATX_CTIME | STATX_MTIME)) && + S_ISREG(inode->i_mode)) + filemap_write_and_wait(inode->i_mapping); /* * We may force a getattr if the user cares about atime. |