NFS: Fallocate should use the nfs4_fattr_bitmap
Subsystems (2)
PATCH v2 1/2 NFS: Fallocate should use the nfs4_fattr_bitmap
From: Anna Schumaker <[email protected]>
Changing a sparse file could have an effect not only on the file size, but also on the number of blocks used by the file in the underlying filesystem. The server's cache_consistency_bitmap doesn't update the SPACE_USED attribute, so let's switch to the nfs4_fattr_bitmap to catch this update whenever we do an ALLOCATE or DEALLOCATE.
This patch fixes xfstests generic/568, which tests that fallocating an unaligned range allocates all blocks touched by that range. Without this patch, stat reports 0 bytes used immediately after the fallocate. Adding a sleep 5 to the test also catches the update, but it's better to do so when we know something has changed.
--- fs/nfs/nfs42proc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/nfs/nfs42proc.c +1 -1
@@ -49,7 +49,7 @@ static int _nfs42_proc_fallocate(struct rpc_message *msg, struct file *filep, .falloc_fh = NFS_FH(inode), .falloc_offset = offset, .falloc_length = len, - .falloc_bitmask = server->cache_consistency_bitmask, + .falloc_bitmask = nfs4_fattr_bitmap, };struct nfs42_falloc_res res = { .falloc_server = server,
Signature · 1 line
2.24.0
PATCH v2 2/2 NFS: Return -ETXTBSY when attempting to write to a swapfile
From: Anna Schumaker <[email protected]>
My understanding is that -EBUSY refers to the underlying device, and that -ETXTBSY is used when attempting to access a file in use by the kernel (like a swapfile). Changing this return code helps us pass xfstests generic/569
--- fs/nfs/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/nfs/file.c +1 -1
@@ -649,7 +649,7 @@ ssize_t nfs_file_write(struct kiocb *iocb, struct iov_iter *from) out_swapfile:printk (KERN_INFO "NFS: attempt to write to active swap file!\n" ); -return -EBUSY ; +return -ETXTBSY ; }EXPORT_SYMBOL_GPL (nfs_file_write);
Signature · 1 line
2.24.0