~hc/RK356X_SDK_RELEASE.git

..	..	@@ -1,3 +1,4 @@
	1	+// SPDX-License-Identifier: GPL-2.0-only
1	2	/*
2	3	* linux/fs/nfs/write.c
3	4	*
..	..	@@ -26,6 +27,7 @@
26	27	#include <linux/iversion.h>
27	28
28	29	#include <linux/uaccess.h>
	30	+#include <linux/sched/mm.h>
29	31
30	32	#include "delegation.h"
31	33	#include "internal.h"
..	..	@@ -55,6 +57,7 @@
55	57	static const struct nfs_pgio_completion_ops nfs_async_write_completion_ops;
56	58	static const struct nfs_commit_completion_ops nfs_commit_completion_ops;
57	59	static const struct nfs_rw_ops nfs_rw_write_ops;
	60	+static void nfs_inode_remove_request(struct nfs_page *req);
58	61	static void nfs_clear_request_commit(struct nfs_page *req);
59	62	static void nfs_init_cinfo_from_inode(struct nfs_commit_info *cinfo,
60	63	struct inode *inode);
..	..	@@ -67,27 +70,17 @@
67	70	static struct kmem_cache *nfs_cdata_cachep;
68	71	static mempool_t *nfs_commit_mempool;
69	72
70		-struct nfs_commit_data *nfs_commitdata_alloc(bool never_fail)
	73	+struct nfs_commit_data *nfs_commitdata_alloc(void)
71	74	{
72	75	struct nfs_commit_data *p;
73	76
74		- if (never_fail)
75		- p = mempool_alloc(nfs_commit_mempool, GFP_NOIO);
76		- else {
77		- /* It is OK to do some reclaim, not no safe to wait
78		- * for anything to be returned to the pool.
79		- * mempool_alloc() cannot handle that particular combination,
80		- * so we need two separate attempts.
81		- */
	77	+ p = kmem_cache_zalloc(nfs_cdata_cachep, nfs_io_gfp_mask());
	78	+ if (!p) {
82	79	p = mempool_alloc(nfs_commit_mempool, GFP_NOWAIT);
83	80	if (!p)
84		- p = kmem_cache_alloc(nfs_cdata_cachep, GFP_NOIO \|
85		- __GFP_NOWARN \| __GFP_NORETRY);
86		- if (!p)
87	81	return NULL;
	82	+ memset(p, 0, sizeof(*p));
88	83	}
89		-
90		- memset(p, 0, sizeof(*p));
91	84	INIT_LIST_HEAD(&p->pages);
92	85	return p;
93	86	}
..	..	@@ -101,9 +94,15 @@
101	94
102	95	static struct nfs_pgio_header *nfs_writehdr_alloc(void)
103	96	{
104		- struct nfs_pgio_header *p = mempool_alloc(nfs_wdata_mempool, GFP_NOIO);
	97	+ struct nfs_pgio_header *p;
105	98
106		- memset(p, 0, sizeof(*p));
	99	+ p = kmem_cache_zalloc(nfs_wdata_cachep, nfs_io_gfp_mask());
	100	+ if (!p) {
	101	+ p = mempool_alloc(nfs_wdata_mempool, GFP_NOWAIT);
	102	+ if (!p)
	103	+ return NULL;
	104	+ memset(p, 0, sizeof(*p));
	105	+ }
107	106	p->rw_mode = FMODE_WRITE;
108	107	return p;
109	108	}
..	..	@@ -144,6 +143,31 @@
144	143	{
145	144	if (ioc != NULL)
146	145	kref_put(&ioc->refcount, nfs_io_completion_release);
	146	+}
	147	+
	148	+static void
	149	+nfs_page_set_inode_ref(struct nfs_page req, struct inode inode)
	150	+{
	151	+ if (!test_and_set_bit(PG_INODE_REF, &req->wb_flags)) {
	152	+ kref_get(&req->wb_kref);
	153	+ atomic_long_inc(&NFS_I(inode)->nrequests);
	154	+ }
	155	+}
	156	+
	157	+static int
	158	+nfs_cancel_remove_inode(struct nfs_page req, struct inode inode)
	159	+{
	160	+ int ret;
	161	+
	162	+ if (!test_bit(PG_REMOVE, &req->wb_flags))
	163	+ return 0;
	164	+ ret = nfs_page_group_lock(req);
	165	+ if (ret)
	166	+ return ret;
	167	+ if (test_and_clear_bit(PG_REMOVE, &req->wb_flags))
	168	+ nfs_page_set_inode_ref(req, inode);
	169	+ nfs_page_group_unlock(req);
	170	+ return 0;
147	171	}
148	172
149	173	static struct nfs_page *
..	..	@@ -215,6 +239,36 @@
215	239	return req;
216	240	}
217	241
	242	+static struct nfs_page nfs_find_and_lock_page_request(struct page page)
	243	+{
	244	+ struct inode *inode = page_file_mapping(page)->host;
	245	+ struct nfs_page req, head;
	246	+ int ret;
	247	+
	248	+ for (;;) {
	249	+ req = nfs_page_find_head_request(page);
	250	+ if (!req)
	251	+ return req;
	252	+ head = nfs_page_group_lock_head(req);
	253	+ if (head != req)
	254	+ nfs_release_request(req);
	255	+ if (IS_ERR(head))
	256	+ return head;
	257	+ ret = nfs_cancel_remove_inode(head, inode);
	258	+ if (ret < 0) {
	259	+ nfs_unlock_and_release_request(head);
	260	+ return ERR_PTR(ret);
	261	+ }
	262	+ /* Ensure that nobody removed the request before we locked it */
	263	+ if (head == nfs_page_private_request(page))
	264	+ break;
	265	+ if (PageSwapCache(page))
	266	+ break;
	267	+ nfs_unlock_and_release_request(head);
	268	+ }
	269	+ return head;
	270	+}
	271	+
218	272	/* Adjust the file length if we're writing beyond the end */
219	273	static void nfs_grow_file(struct page *page, unsigned int offset, unsigned int count)
220	274	{
..	..	@@ -249,6 +303,18 @@
249	303	NFS_INO_REVAL_PAGECACHE \|
250	304	NFS_INO_INVALID_SIZE;
251	305	spin_unlock(&inode->i_lock);
	306	+}
	307	+
	308	+static void nfs_mapping_set_error(struct page *page, int error)
	309	+{
	310	+ struct address_space *mapping = page_file_mapping(page);
	311	+
	312	+ SetPageError(page);
	313	+ filemap_set_wb_err(mapping, error);
	314	+ if (mapping->host)
	315	+ errseq_set(&mapping->host->i_sb->s_wb_err,
	316	+ error == -ENOSPC ? -ENOSPC : -EIO);
	317	+ nfs_set_pageerror(mapping);
252	318	}
253	319
254	320	/*
..	..	@@ -368,34 +434,6 @@
368	434	}
369	435
370	436	/*
371		- * nfs_unroll_locks_and_wait - unlock all newly locked reqs and wait on @req
372		- *
373		- * this is a helper function for nfs_lock_and_join_requests
374		- *
375		- * @inode - inode associated with request page group, must be holding inode lock
376		- * @head - head request of page group, must be holding head lock
377		- * @req - request that couldn't lock and needs to wait on the req bit lock
378		- *
379		- * NOTE: this must be called holding page_group bit lock
380		- * which will be released before returning.
381		- *
382		- * returns 0 on success, < 0 on error.
383		- */
384		-static void
385		-nfs_unroll_locks(struct inode inode, struct nfs_page head,
386		- struct nfs_page *req)
387		-{
388		- struct nfs_page *tmp;
389		-
390		- /* relinquish all the locks successfully grabbed this run */
391		- for (tmp = head->wb_this_page ; tmp != req; tmp = tmp->wb_this_page) {
392		- if (!kref_read(&tmp->wb_kref))
393		- continue;
394		- nfs_unlock_and_release_request(tmp);
395		- }
396		-}
397		-
398		-/*
399	437	* nfs_destroy_unlinked_subrequests - destroy recently unlinked subrequests
400	438	*
401	439	* @destroy_list - request list (using wb_this_page) terminated by @old_head
..	..	@@ -452,11 +490,64 @@
452	490	}
453	491
454	492	/*
455		- * nfs_lock_and_join_requests - join all subreqs to the head req and return
456		- * a locked reference, cancelling any pending
457		- * operations for this page.
	493	+ * nfs_join_page_group - destroy subrequests of the head req
	494	+ * @head: the page used to lookup the "page group" of nfs_page structures
	495	+ * @inode: Inode to which the request belongs.
458	496	*
459		- * @page - the page used to lookup the "page group" of nfs_page structures
	497	+ * This function joins all sub requests to the head request by first
	498	+ * locking all requests in the group, cancelling any pending operations
	499	+ * and finally updating the head request to cover the whole range covered by
	500	+ * the (former) group. All subrequests are removed from any write or commit
	501	+ * lists, unlinked from the group and destroyed.
	502	+ */
	503	+void
	504	+nfs_join_page_group(struct nfs_page head, struct inode inode)
	505	+{
	506	+ struct nfs_page *subreq;
	507	+ struct nfs_page *destroy_list = NULL;
	508	+ unsigned int pgbase, off, bytes;
	509	+
	510	+ pgbase = head->wb_pgbase;
	511	+ bytes = head->wb_bytes;
	512	+ off = head->wb_offset;
	513	+ for (subreq = head->wb_this_page; subreq != head;
	514	+ subreq = subreq->wb_this_page) {
	515	+ /* Subrequests should always form a contiguous range */
	516	+ if (pgbase > subreq->wb_pgbase) {
	517	+ off -= pgbase - subreq->wb_pgbase;
	518	+ bytes += pgbase - subreq->wb_pgbase;
	519	+ pgbase = subreq->wb_pgbase;
	520	+ }
	521	+ bytes = max(subreq->wb_pgbase + subreq->wb_bytes
	522	+ - pgbase, bytes);
	523	+ }
	524	+
	525	+ /* Set the head request's range to cover the former page group */
	526	+ head->wb_pgbase = pgbase;
	527	+ head->wb_bytes = bytes;
	528	+ head->wb_offset = off;
	529	+
	530	+ /* Now that all requests are locked, make sure they aren't on any list.
	531	+ * Commit list removal accounting is done after locks are dropped */
	532	+ subreq = head;
	533	+ do {
	534	+ nfs_clear_request_commit(subreq);
	535	+ subreq = subreq->wb_this_page;
	536	+ } while (subreq != head);
	537	+
	538	+ /* unlink subrequests from head, destroy them later */
	539	+ if (head->wb_this_page != head) {
	540	+ /* destroy list will be terminated by head */
	541	+ destroy_list = head->wb_this_page;
	542	+ head->wb_this_page = head;
	543	+ }
	544	+
	545	+ nfs_destroy_unlinked_subrequests(destroy_list, head, inode);
	546	+}
	547	+
	548	+/*
	549	+ * nfs_lock_and_join_requests - join all subreqs to the head req
	550	+ * @page: the page used to lookup the "page group" of nfs_page structures
460	551	*
461	552	* This function joins all sub requests to the head request by first
462	553	* locking all requests in the group, cancelling any pending operations
..	..	@@ -473,147 +564,37 @@
473	564	nfs_lock_and_join_requests(struct page *page)
474	565	{
475	566	struct inode *inode = page_file_mapping(page)->host;
476		- struct nfs_page head, subreq;
477		- struct nfs_page *destroy_list = NULL;
478		- unsigned int total_bytes;
	567	+ struct nfs_page *head;
479	568	int ret;
480	569
481		-try_again:
482	570	/*
483	571	* A reference is taken only on the head request which acts as a
484	572	* reference to the whole page group - the group will not be destroyed
485	573	* until the head reference is released.
486	574	*/
487		- head = nfs_page_find_head_request(page);
488		- if (!head)
489		- return NULL;
490		-
491		- /* lock the page head first in order to avoid an ABBA inefficiency */
492		- if (!nfs_lock_request(head)) {
493		- ret = nfs_wait_on_request(head);
494		- nfs_release_request(head);
495		- if (ret < 0)
496		- return ERR_PTR(ret);
497		- goto try_again;
498		- }
499		-
500		- /* Ensure that nobody removed the request before we locked it */
501		- if (head != nfs_page_private_request(page) && !PageSwapCache(page)) {
502		- nfs_unlock_and_release_request(head);
503		- goto try_again;
504		- }
505		-
506		- ret = nfs_page_group_lock(head);
507		- if (ret < 0)
508		- goto release_request;
	575	+ head = nfs_find_and_lock_page_request(page);
	576	+ if (IS_ERR_OR_NULL(head))
	577	+ return head;
509	578
510	579	/* lock each request in the page group */
511		- total_bytes = head->wb_bytes;
512		- for (subreq = head->wb_this_page; subreq != head;
513		- subreq = subreq->wb_this_page) {
514		-
515		- if (!kref_get_unless_zero(&subreq->wb_kref)) {
516		- if (subreq->wb_offset == head->wb_offset + total_bytes)
517		- total_bytes += subreq->wb_bytes;
518		- continue;
519		- }
520		-
521		- while (!nfs_lock_request(subreq)) {
522		- /*
523		- * Unlock page to allow nfs_page_group_sync_on_bit()
524		- * to succeed
525		- */
526		- nfs_page_group_unlock(head);
527		- ret = nfs_wait_on_request(subreq);
528		- if (!ret)
529		- ret = nfs_page_group_lock(head);
530		- if (ret < 0) {
531		- nfs_unroll_locks(inode, head, subreq);
532		- nfs_release_request(subreq);
533		- goto release_request;
534		- }
535		- }
536		- /*
537		- * Subrequests are always contiguous, non overlapping
538		- * and in order - but may be repeated (mirrored writes).
539		- */
540		- if (subreq->wb_offset == (head->wb_offset + total_bytes)) {
541		- /* keep track of how many bytes this group covers */
542		- total_bytes += subreq->wb_bytes;
543		- } else if (WARN_ON_ONCE(subreq->wb_offset < head->wb_offset \|\|
544		- ((subreq->wb_offset + subreq->wb_bytes) >
545		- (head->wb_offset + total_bytes)))) {
546		- nfs_page_group_unlock(head);
547		- nfs_unroll_locks(inode, head, subreq);
548		- nfs_unlock_and_release_request(subreq);
549		- ret = -EIO;
550		- goto release_request;
551		- }
552		- }
553		-
554		- /* Now that all requests are locked, make sure they aren't on any list.
555		- * Commit list removal accounting is done after locks are dropped */
556		- subreq = head;
557		- do {
558		- nfs_clear_request_commit(subreq);
559		- subreq = subreq->wb_this_page;
560		- } while (subreq != head);
561		-
562		- /* unlink subrequests from head, destroy them later */
563		- if (head->wb_this_page != head) {
564		- /* destroy list will be terminated by head */
565		- destroy_list = head->wb_this_page;
566		- head->wb_this_page = head;
567		-
568		- /* change head request to cover whole range that
569		- * the former page group covered */
570		- head->wb_bytes = total_bytes;
571		- }
572		-
573		- /* Postpone destruction of this request */
574		- if (test_and_clear_bit(PG_REMOVE, &head->wb_flags)) {
575		- set_bit(PG_INODE_REF, &head->wb_flags);
576		- kref_get(&head->wb_kref);
577		- atomic_long_inc(&NFS_I(inode)->nrequests);
578		- }
579		-
580		- nfs_page_group_unlock(head);
581		-
582		- nfs_destroy_unlinked_subrequests(destroy_list, head, inode);
583		-
584		- /* Did we lose a race with nfs_inode_remove_request()? */
585		- if (!(PagePrivate(page) \|\| PageSwapCache(page))) {
	580	+ ret = nfs_page_group_lock_subrequests(head);
	581	+ if (ret < 0) {
586	582	nfs_unlock_and_release_request(head);
587		- return NULL;
	583	+ return ERR_PTR(ret);
588	584	}
589	585
590		- /* still holds ref on head from nfs_page_find_head_request
591		- * and still has lock on head from lock loop */
	586	+ nfs_join_page_group(head, inode);
	587	+
592	588	return head;
593		-
594		-release_request:
595		- nfs_unlock_and_release_request(head);
596		- return ERR_PTR(ret);
597	589	}
598	590
599		-static void nfs_write_error_remove_page(struct nfs_page *req)
	591	+static void nfs_write_error(struct nfs_page *req, int error)
600	592	{
	593	+ trace_nfs_write_error(req, error);
	594	+ nfs_mapping_set_error(req->wb_page, error);
	595	+ nfs_inode_remove_request(req);
601	596	nfs_end_page_writeback(req);
602		- generic_error_remove_page(page_file_mapping(req->wb_page),
603		- req->wb_page);
604	597	nfs_release_request(req);
605		-}
606		-
607		-static bool
608		-nfs_error_is_fatal_on_server(int err)
609		-{
610		- switch (err) {
611		- case 0:
612		- case -ERESTARTSYS:
613		- case -EINTR:
614		- return false;
615		- }
616		- return nfs_error_is_fatal(err);
617	598	}
618	599
619	600	/*
..	..	@@ -636,8 +617,8 @@
636	617	nfs_set_page_writeback(page);
637	618	WARN_ON_ONCE(test_bit(PG_CLEAN, &req->wb_flags));
638	619
639		- ret = req->wb_context->error;
640	620	/* If there is a fatal error that covers this write, just exit */
	621	+ ret = pgio->pg_error;
641	622	if (nfs_error_is_fatal_on_server(ret))
642	623	goto out_launder;
643	624
..	..	@@ -648,19 +629,19 @@
648	629	* Remove the problematic req upon fatal errors on the server
649	630	*/
650	631	if (nfs_error_is_fatal(ret)) {
651		- nfs_context_set_write_error(req->wb_context, ret);
652	632	if (nfs_error_is_fatal_on_server(ret))
653	633	goto out_launder;
654	634	} else
655	635	ret = -EAGAIN;
656	636	nfs_redirty_request(req);
	637	+ pgio->pg_error = 0;
657	638	} else
658	639	nfs_add_stats(page_file_mapping(page)->host,
659	640	NFSIOS_WRITEPAGES, 1);
660	641	out:
661	642	return ret;
662	643	out_launder:
663		- nfs_write_error_remove_page(req);
	644	+ nfs_write_error(req, ret);
664	645	return 0;
665	646	}
666	647
..	..	@@ -673,7 +654,7 @@
673	654	ret = nfs_page_async_flush(pgio, page);
674	655	if (ret == -EAGAIN) {
675	656	redirty_page_for_writepage(wbc, page);
676		- ret = 0;
	657	+ ret = AOP_WRITEPAGE_ACTIVATE;
677	658	}
678	659	return ret;
679	660	}
..	..	@@ -692,12 +673,9 @@
692	673	nfs_pageio_init_write(&pgio, inode, 0,
693	674	false, &nfs_async_write_completion_ops);
694	675	err = nfs_do_writepage(page, wbc, &pgio);
	676	+ pgio.pg_error = 0;
695	677	nfs_pageio_complete(&pgio);
696		- if (err < 0)
697		- return err;
698		- if (pgio.pg_error < 0)
699		- return pgio.pg_error;
700		- return 0;
	678	+ return err;
701	679	}
702	680
703	681	int nfs_writepage(struct page page, struct writeback_control wbc)
..	..	@@ -705,7 +683,8 @@
705	683	int ret;
706	684
707	685	ret = nfs_writepage_locked(page, wbc);
708		- unlock_page(page);
	686	+ if (ret != AOP_WRITEPAGE_ACTIVATE)
	687	+ unlock_page(page);
709	688	return ret;
710	689	}
711	690
..	..	@@ -714,7 +693,8 @@
714	693	int ret;
715	694
716	695	ret = nfs_do_writepage(page, wbc, data);
717		- unlock_page(page);
	696	+ if (ret != AOP_WRITEPAGE_ACTIVATE)
	697	+ unlock_page(page);
718	698	return ret;
719	699	}
720	700
..	..	@@ -727,11 +707,12 @@
727	707	{
728	708	struct inode *inode = mapping->host;
729	709	struct nfs_pageio_descriptor pgio;
730		- struct nfs_io_completion *ioc = nfs_io_completion_alloc(GFP_NOFS);
	710	+ struct nfs_io_completion *ioc;
731	711	int err;
732	712
733	713	nfs_inc_stats(inode, NFSIOS_VFSWRITEPAGES);
734	714
	715	+ ioc = nfs_io_completion_alloc(GFP_KERNEL);
735	716	if (ioc)
736	717	nfs_io_completion_init(ioc, nfs_io_completion_commit, inode);
737	718
..	..	@@ -739,12 +720,10 @@
739	720	&nfs_async_write_completion_ops);
740	721	pgio.pg_io_completion = ioc;
741	722	err = write_cache_pages(mapping, wbc, nfs_writepages_callback, &pgio);
	723	+ pgio.pg_error = 0;
742	724	nfs_pageio_complete(&pgio);
743	725	nfs_io_completion_put(ioc);
744	726
745		- if (err < 0)
746		- goto out_err;
747		- err = pgio.pg_error;
748	727	if (err < 0)
749	728	goto out_err;
750	729	return 0;
..	..	@@ -881,7 +860,6 @@
881	860	/**
882	861	* nfs_request_add_commit_list - add request to a commit list
883	862	* @req: pointer to a struct nfs_page
884		- * @dst: commit list head
885	863	* @cinfo: holds list lock and accounting info
886	864	*
887	865	* This sets the PG_CLEAN bit, updates the cinfo count of
..	..	@@ -960,9 +938,9 @@
960	938	static void
961	939	nfs_clear_page_commit(struct page *page)
962	940	{
963		- dec_node_page_state(page, NR_UNSTABLE_NFS);
	941	+ dec_node_page_state(page, NR_WRITEBACK);
964	942	dec_wb_stat(&inode_to_bdi(page_file_mapping(page)->host)->wb,
965		- WB_RECLAIMABLE);
	943	+ WB_WRITEBACK);
966	944	}
967	945
968	946	/* Called holding the request lock on @req */
..	..	@@ -970,7 +948,8 @@
970	948	nfs_clear_request_commit(struct nfs_page *req)
971	949	{
972	950	if (test_bit(PG_CLEAN, &req->wb_flags)) {
973		- struct inode *inode = d_inode(req->wb_context->dentry);
	951	+ struct nfs_open_context *ctx = nfs_req_openctx(req);
	952	+ struct inode *inode = d_inode(ctx->dentry);
974	953	struct nfs_commit_info cinfo;
975	954
976	955	nfs_init_cinfo_from_inode(&cinfo, inode);
..	..	@@ -1010,11 +989,13 @@
1010	989	nfs_list_remove_request(req);
1011	990	if (test_bit(NFS_IOHDR_ERROR, &hdr->flags) &&
1012	991	(hdr->good_bytes < bytes)) {
1013		- nfs_set_pageerror(page_file_mapping(req->wb_page));
1014		- nfs_context_set_write_error(req->wb_context, hdr->error);
	992	+ trace_nfs_comp_error(req, hdr->error);
	993	+ nfs_mapping_set_error(req->wb_page, hdr->error);
1015	994	goto remove_req;
1016	995	}
1017	996	if (nfs_write_need_commit(hdr)) {
	997	+ /* Reset wb_nio, since the write was successful. */
	998	+ req->wb_nio = 0;
1018	999	memcpy(&req->wb_verf, &hdr->verf.verifier, sizeof(req->wb_verf));
1019	1000	nfs_mark_request_commit(req, hdr->lseg, &cinfo,
1020	1001	hdr->pgio_mirror_idx);
..	..	@@ -1134,6 +1115,7 @@
1134	1115	req->wb_bytes = end - req->wb_offset;
1135	1116	else
1136	1117	req->wb_bytes = rqend - req->wb_offset;
	1118	+ req->wb_nio = 0;
1137	1119	return req;
1138	1120	out_flushme:
1139	1121	/*
..	..	@@ -1163,7 +1145,7 @@
1163	1145	req = nfs_try_to_update_request(inode, page, offset, bytes);
1164	1146	if (req != NULL)
1165	1147	goto out;
1166		- req = nfs_create_request(ctx, page, NULL, offset, bytes);
	1148	+ req = nfs_create_request(ctx, page, offset, bytes);
1167	1149	if (IS_ERR(req))
1168	1150	goto out;
1169	1151	nfs_inode_add_request(inode, req);
..	..	@@ -1208,7 +1190,7 @@
1208	1190	return 0;
1209	1191	l_ctx = req->wb_lock_context;
1210	1192	do_flush = req->wb_page != page \|\|
1211		- !nfs_match_open_context(req->wb_context, ctx);
	1193	+ !nfs_match_open_context(nfs_req_openctx(req), ctx);
1212	1194	if (l_ctx && flctx &&
1213	1195	!(list_empty_careful(&flctx->flc_posix) &&
1214	1196	list_empty_careful(&flctx->flc_flock))) {
..	..	@@ -1236,9 +1218,12 @@
1236	1218	nfs_key_timeout_notify(struct file filp, struct inode inode)
1237	1219	{
1238	1220	struct nfs_open_context *ctx = nfs_file_open_context(filp);
1239		- struct rpc_auth *auth = NFS_SERVER(inode)->client->cl_auth;
1240	1221
1241		- return rpcauth_key_timeout_notify(auth, ctx->cred);
	1222	+ if (nfs_ctx_key_to_expire(ctx, inode) &&
	1223	+ !ctx->ll_cred)
	1224	+ /* Already expired! */
	1225	+ return -EACCES;
	1226	+ return 0;
1242	1227	}
1243	1228
1244	1229	/*
..	..	@@ -1247,8 +1232,23 @@
1247	1232	bool nfs_ctx_key_to_expire(struct nfs_open_context ctx, struct inode inode)
1248	1233	{
1249	1234	struct rpc_auth *auth = NFS_SERVER(inode)->client->cl_auth;
	1235	+ struct rpc_cred *cred = ctx->ll_cred;
	1236	+ struct auth_cred acred = {
	1237	+ .cred = ctx->cred,
	1238	+ };
1250	1239
1251		- return rpcauth_cred_key_to_expire(auth, ctx->cred);
	1240	+ if (cred && !cred->cr_ops->crmatch(&acred, cred, 0)) {
	1241	+ put_rpccred(cred);
	1242	+ ctx->ll_cred = NULL;
	1243	+ cred = NULL;
	1244	+ }
	1245	+ if (!cred)
	1246	+ cred = auth->au_ops->lookup_cred(auth, &acred, 0);
	1247	+ if (!cred \|\| IS_ERR(cred))
	1248	+ return true;
	1249	+ ctx->ll_cred = cred;
	1250	+ return !!(cred->cr_ops->crkey_timeout &&
	1251	+ cred->cr_ops->crkey_timeout(cred));
1252	1252	}
1253	1253
1254	1254	/*
..	..	@@ -1380,8 +1380,7 @@
1380	1380
1381	1381	task_setup_data->priority = priority;
1382	1382	rpc_ops->write_setup(hdr, msg, &task_setup_data->rpc_client);
1383		- trace_nfs_initiate_write(hdr->inode, hdr->io_start, hdr->good_bytes,
1384		- hdr->args.stable);
	1383	+ trace_nfs_initiate_write(hdr);
1385	1384	}
1386	1385
1387	1386	/* If a nfs_flush_* function fails, it should remove reqs from @head and
..	..	@@ -1390,8 +1389,10 @@
1390	1389	*/
1391	1390	static void nfs_redirty_request(struct nfs_page *req)
1392	1391	{
	1392	+ /* Bump the transmission count */
	1393	+ req->wb_nio++;
1393	1394	nfs_mark_request_dirty(req);
1394		- set_bit(NFS_CONTEXT_RESEND_WRITES, &req->wb_context->flags);
	1395	+ set_bit(NFS_CONTEXT_RESEND_WRITES, &nfs_req_openctx(req)->flags);
1395	1396	nfs_end_page_writeback(req);
1396	1397	nfs_release_request(req);
1397	1398	}
..	..	@@ -1403,14 +1404,10 @@
1403	1404	while (!list_empty(head)) {
1404	1405	req = nfs_list_entry(head->next);
1405	1406	nfs_list_remove_request(req);
1406		- if (nfs_error_is_fatal(error)) {
1407		- nfs_context_set_write_error(req->wb_context, error);
1408		- if (nfs_error_is_fatal_on_server(error)) {
1409		- nfs_write_error_remove_page(req);
1410		- continue;
1411		- }
1412		- }
1413		- nfs_redirty_request(req);
	1407	+ if (nfs_error_is_fatal_on_server(error))
	1408	+ nfs_write_error(req, error);
	1409	+ else
	1410	+ nfs_redirty_request(req);
1414	1411	}
1415	1412	}
1416	1413
..	..	@@ -1547,8 +1544,7 @@
1547	1544	return status;
1548	1545
1549	1546	nfs_add_stats(inode, NFSIOS_SERVERWRITTENBYTES, hdr->res.count);
1550		- trace_nfs_writeback_done(inode, task->tk_status,
1551		- hdr->args.offset, hdr->res.verf);
	1547	+ trace_nfs_writeback_done(task, hdr);
1552	1548
1553	1549	if (hdr->res.verf->committed < hdr->args.stable &&
1554	1550	task->tk_status >= 0) {
..	..	@@ -1628,6 +1624,8 @@
1628	1624	*/
1629	1625	argp->stable = NFS_FILE_SYNC;
1630	1626	}
	1627	+ resp->count = 0;
	1628	+ resp->verf->committed = 0;
1631	1629	rpc_restart_call_prepare(task);
1632	1630	}
1633	1631	}
..	..	@@ -1643,10 +1641,13 @@
1643	1641	atomic_inc(&cinfo->rpcs_out);
1644	1642	}
1645	1643
1646		-static void nfs_commit_end(struct nfs_mds_commit_info *cinfo)
	1644	+bool nfs_commit_end(struct nfs_mds_commit_info *cinfo)
1647	1645	{
1648		- if (atomic_dec_and_test(&cinfo->rpcs_out))
	1646	+ if (atomic_dec_and_test(&cinfo->rpcs_out)) {
1649	1647	wake_up_var(&cinfo->rpcs_out);
	1648	+ return true;
	1649	+ }
	1650	+ return false;
1650	1651	}
1651	1652
1652	1653	void nfs_commitdata_release(struct nfs_commit_data *data)
..	..	@@ -1714,16 +1715,22 @@
1714	1715	struct pnfs_layout_segment *lseg,
1715	1716	struct nfs_commit_info *cinfo)
1716	1717	{
1717		- struct nfs_page *first = nfs_list_entry(head->next);
1718		- struct inode *inode = d_inode(first->wb_context->dentry);
	1718	+ struct nfs_page *first;
	1719	+ struct nfs_open_context *ctx;
	1720	+ struct inode *inode;
1719	1721
1720	1722	/* Set up the RPC argument and reply structs
1721	1723	* NB: take care not to mess about with data->commit et al. */
1722	1724
1723		- list_splice_init(head, &data->pages);
	1725	+ if (head)
	1726	+ list_splice_init(head, &data->pages);
	1727	+
	1728	+ first = nfs_list_entry(data->pages.next);
	1729	+ ctx = nfs_req_openctx(first);
	1730	+ inode = d_inode(ctx->dentry);
1724	1731
1725	1732	data->inode = inode;
1726		- data->cred = first->wb_context->cred;
	1733	+ data->cred = ctx->cred;
1727	1734	data->lseg = lseg; /* reference transferred */
1728	1735	/* only set lwb for pnfs commit */
1729	1736	if (lseg)
..	..	@@ -1736,10 +1743,11 @@
1736	1743	/* Note: we always request a commit of the entire inode */
1737	1744	data->args.offset = 0;
1738	1745	data->args.count = 0;
1739		- data->context = get_nfs_open_context(first->wb_context);
	1746	+ data->context = get_nfs_open_context(ctx);
1740	1747	data->res.fattr = &data->fattr;
1741	1748	data->res.verf = &data->verf;
1742	1749	nfs_fattr_init(&data->fattr);
	1750	+ nfs_commit_begin(cinfo->mds);
1743	1751	}
1744	1752	EXPORT_SYMBOL_GPL(nfs_init_commit);
1745	1753
..	..	@@ -1781,13 +1789,16 @@
1781	1789	if (list_empty(head))
1782	1790	return 0;
1783	1791
1784		- data = nfs_commitdata_alloc(true);
	1792	+ data = nfs_commitdata_alloc();
	1793	+ if (!data) {
	1794	+ nfs_retry_commit(head, NULL, cinfo, -1);
	1795	+ return -ENOMEM;
	1796	+ }
1785	1797
1786	1798	/* Set up the argument struct */
1787	1799	nfs_init_commit(data, head, NULL, cinfo);
1788		- atomic_inc(&cinfo->mds->rpcs_out);
1789	1800	return nfs_initiate_commit(NFS_CLIENT(inode), data, NFS_PROTO(inode),
1790		- data->mds_ops, how, 0);
	1801	+ data->mds_ops, how, RPC_TASK_CRED_NOREF);
1791	1802	}
1792	1803
1793	1804	/*
..	..	@@ -1802,7 +1813,7 @@
1802	1813
1803	1814	/* Call the NFS version-specific code */
1804	1815	NFS_PROTO(data->inode)->commit_done(task, data);
1805		- trace_nfs_commit_done(data);
	1816	+ trace_nfs_commit_done(task, data);
1806	1817	}
1807	1818
1808	1819	static void nfs_commit_release_pages(struct nfs_commit_data *data)
..	..	@@ -1820,22 +1831,23 @@
1820	1831	nfs_clear_page_commit(req->wb_page);
1821	1832
1822	1833	dprintk("NFS: commit (%s/%llu %d@%lld)",
1823		- req->wb_context->dentry->d_sb->s_id,
1824		- (unsigned long long)NFS_FILEID(d_inode(req->wb_context->dentry)),
	1834	+ nfs_req_openctx(req)->dentry->d_sb->s_id,
	1835	+ (unsigned long long)NFS_FILEID(d_inode(nfs_req_openctx(req)->dentry)),
1825	1836	req->wb_bytes,
1826	1837	(long long)req_offset(req));
1827	1838	if (status < 0) {
1828		- nfs_context_set_write_error(req->wb_context, status);
1829		- if (req->wb_page)
	1839	+ if (req->wb_page) {
	1840	+ trace_nfs_commit_error(req, status);
	1841	+ nfs_mapping_set_error(req->wb_page, status);
1830	1842	nfs_inode_remove_request(req);
	1843	+ }
1831	1844	dprintk_cont(", error = %d\n", status);
1832	1845	goto next;
1833	1846	}
1834	1847
1835	1848	/* Okay, COMMIT succeeded, apparently. Check the verifier
1836	1849	* returned by the server against all stored verfs. */
1837		- if (verf->committed > NFS_UNSTABLE &&
1838		- !nfs_write_verifier_cmp(&req->wb_verf, &verf->verifier)) {
	1850	+ if (nfs_write_match_verf(verf, req)) {
1839	1851	/* We have a match */
1840	1852	if (req->wb_page)
1841	1853	nfs_inode_remove_request(req);
..	..	@@ -1845,7 +1857,7 @@
1845	1857	/* We have a mismatch. Write the page again */
1846	1858	dprintk_cont(" mismatch\n");
1847	1859	nfs_mark_request_dirty(req);
1848		- set_bit(NFS_CONTEXT_RESEND_WRITES, &req->wb_context->flags);
	1860	+ set_bit(NFS_CONTEXT_RESEND_WRITES, &nfs_req_openctx(req)->flags);
1849	1861	next:
1850	1862	nfs_unlock_and_release_request(req);
1851	1863	/* Latency breaker */
..	..	@@ -2135,7 +2147,7 @@
2135	2147	* This allows larger machines to have larger/more transfers.
2136	2148	* Limit the default to 256M
2137	2149	*/
2138		- nfs_congestion_kb = (16*int_sqrt(totalram_pages)) << (PAGE_SHIFT-10);
	2150	+ nfs_congestion_kb = (16*int_sqrt(totalram_pages())) << (PAGE_SHIFT-10);
2139	2151	if (nfs_congestion_kb > 256*1024)
2140	2152	nfs_congestion_kb = 256*1024;
2141	2153