Commit 3d3699bd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'nfs-for-6.3-2' of git://git.linux-nfs.org/projects/anna/linux-nfs 

Pull NFS client fixes from Anna Schumaker:

 - Fix /proc/PID/io read_bytes accounting

 - Fix setting NLM file_lock start and end during decoding testargs

 - Fix timing for setting access cache timestamps

* tag 'nfs-for-6.3-2' of git://git.linux-nfs.org/projects/anna/linux-nfs:
  NFS: Correct timing for assigning access cache timestamp
  lockd: set file_lock start and end when decoding nlm4 testargs
  NFS: Fix /proc/PID/io read_bytes for buffered reads
parents e8d018dd 21fd9e87

fs/lockd/clnt4xdr.c

+1 −8
Original line number Diff line number Diff line
@@ -261,7 +261,6 @@ static int decode_nlm4_holder(struct xdr_stream *xdr, struct nlm_res *result) 
	u32 exclusive;

	int error;

	__be32 *p;

	s32 end;



	memset(lock, 0, sizeof(*lock));

	locks_init_lock(fl);
@@ -285,13 +284,7 @@ static int decode_nlm4_holder(struct xdr_stream *xdr, struct nlm_res *result) 
	fl->fl_type  = exclusive != 0 ? F_WRLCK : F_RDLCK;

	p = xdr_decode_hyper(p, &l_offset);

	xdr_decode_hyper(p, &l_len);

	end = l_offset + l_len - 1;



	fl->fl_start = (loff_t)l_offset;

	if (l_len == 0 || end < 0)

		fl->fl_end = OFFSET_MAX;

	else

		fl->fl_end = (loff_t)end;

	nlm4svc_set_file_lock_range(fl, l_offset, l_len);

	error = 0;

out:

	return error;

fs/lockd/xdr4.c

+12 −1
Original line number Diff line number Diff line
@@ -33,6 +33,17 @@ loff_t_to_s64(loff_t offset) 
	return res;

}



void nlm4svc_set_file_lock_range(struct file_lock *fl, u64 off, u64 len)

{

	s64 end = off + len - 1;



	fl->fl_start = off;

	if (len == 0 || end < 0)

		fl->fl_end = OFFSET_MAX;

	else

		fl->fl_end = end;

}



/*

 * NLM file handles are defined by specification to be a variable-length

 * XDR opaque no longer than 1024 bytes. However, this implementation
@@ -80,7 +91,7 @@ svcxdr_decode_lock(struct xdr_stream *xdr, struct nlm_lock *lock) 
	locks_init_lock(fl);

	fl->fl_flags = FL_POSIX;

	fl->fl_type  = F_RDLCK;



	nlm4svc_set_file_lock_range(fl, lock->lock_start, lock->lock_len);

	return true;

}

fs/nfs/dir.c

+1 −1
Original line number Diff line number Diff line
@@ -3089,7 +3089,6 @@ static void nfs_access_add_rbtree(struct inode *inode, 
		else

			goto found;

	}

	set->timestamp = ktime_get_ns();

	rb_link_node(&set->rb_node, parent, p);

	rb_insert_color(&set->rb_node, root_node);

	list_add_tail(&set->lru, &nfsi->access_cache_entry_lru);
@@ -3114,6 +3113,7 @@ void nfs_access_add_cache(struct inode *inode, struct nfs_access_entry *set, 
	cache->fsgid = cred->fsgid;

	cache->group_info = get_group_info(cred->group_info);

	cache->mask = set->mask;

	cache->timestamp = ktime_get_ns();



	/* The above field assignments must be visible

	 * before this item appears on the lru.  We cannot easily

fs/nfs/read.c

+3 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <linux/stat.h>

#include <linux/mm.h>

#include <linux/slab.h>

#include <linux/task_io_accounting_ops.h>

#include <linux/pagemap.h>

#include <linux/sunrpc/clnt.h>

#include <linux/nfs_fs.h>
@@ -337,6 +338,7 @@ int nfs_read_folio(struct file *file, struct folio *folio) 


	trace_nfs_aop_readpage(inode, folio);

	nfs_inc_stats(inode, NFSIOS_VFSREADPAGE);

	task_io_account_read(folio_size(folio));



	/*

	 * Try to flush any pending writes to the file..
@@ -393,6 +395,7 @@ void nfs_readahead(struct readahead_control *ractl) 


	trace_nfs_aop_readahead(inode, readahead_pos(ractl), nr_pages);

	nfs_inc_stats(inode, NFSIOS_VFSREADPAGES);

	task_io_account_read(readahead_length(ractl));



	ret = -ESTALE;

	if (NFS_STALE(inode))

include/linux/lockd/xdr4.h

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#define	nlm4_fbig		cpu_to_be32(NLM_FBIG)

#define	nlm4_failed		cpu_to_be32(NLM_FAILED)



void	nlm4svc_set_file_lock_range(struct file_lock *fl, u64 off, u64 len);

bool	nlm4svc_decode_void(struct svc_rqst *rqstp, struct xdr_stream *xdr);

bool	nlm4svc_decode_testargs(struct svc_rqst *rqstp, struct xdr_stream *xdr);

bool	nlm4svc_decode_lockargs(struct svc_rqst *rqstp, struct xdr_stream *xdr);