diff options
| author | Jonathan Corbet <corbet@lwn.net> | 2021-12-10 13:57:09 -0700 |
|---|---|---|
| committer | Jonathan Corbet <corbet@lwn.net> | 2021-12-10 13:57:09 -0700 |
| commit | a7fb920b158da0a154da609a4c27ff693404ec90 (patch) | |
| tree | 0637688614d7889aef9dd76870b9605d3f563247 /fs/nfs/nfs42proc.c | |
| parent | ce881fc06dc87e73928ced4c37b6ac6b32ef5fb6 (diff) | |
| parent | 0fcfb00b28c0b7884635dacf38e46d60bf3d4eb1 (diff) | |
Merge tag 'v5.16-rc4' into docs-next
I have a couple of fixes for warnings introduced after -rc1; catch up to
-rc4 so that the fixes have something to fix.
Diffstat (limited to 'fs/nfs/nfs42proc.c')
| -rw-r--r-- | fs/nfs/nfs42proc.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/nfs/nfs42proc.c b/fs/nfs/nfs42proc.c index 08355b66e7cb..8b21ff1be717 100644 --- a/fs/nfs/nfs42proc.c +++ b/fs/nfs/nfs42proc.c @@ -289,7 +289,9 @@ static void nfs42_copy_dest_done(struct inode *inode, loff_t pos, loff_t len) loff_t newsize = pos + len; loff_t end = newsize - 1; - truncate_pagecache_range(inode, pos, end); + WARN_ON_ONCE(invalidate_inode_pages2_range(inode->i_mapping, + pos >> PAGE_SHIFT, end >> PAGE_SHIFT)); + spin_lock(&inode->i_lock); if (newsize > i_size_read(inode)) i_size_write(inode, newsize); |