From owner-cvs-src-old@FreeBSD.ORG Wed Jun 1 21:00:49 2011 Return-Path: Delivered-To: cvs-src-old@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E4FE71065674 for ; Wed, 1 Jun 2011 21:00:49 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D11AB8FC12 for ; Wed, 1 Jun 2011 21:00:49 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id p51L0nBJ075934 for ; Wed, 1 Jun 2011 21:00:49 GMT (envelope-from kib@repoman.freebsd.org) Received: (from svn2cvs@localhost) by repoman.freebsd.org (8.14.4/8.14.4/Submit) id p51L0nUd075933 for cvs-src-old@freebsd.org; Wed, 1 Jun 2011 21:00:49 GMT (envelope-from kib@repoman.freebsd.org) Message-Id: <201106012100.p51L0nUd075933@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to kib@repoman.freebsd.org using -f From: Konstantin Belousov Date: Wed, 1 Jun 2011 21:00:28 +0000 (UTC) To: cvs-src-old@freebsd.org X-FreeBSD-CVS-Branch: HEAD Subject: cvs commit: src/sys/fs/nfsclient nfs_clbio.c src/sys/fs/nwfs nwfs_io.c src/sys/fs/smbfs smbfs_io.c src/sys/nfsclient nfs_bio.c src/sys/vm vm_object.c vnode_pager.c vnode_pager.h X-BeenThere: cvs-src-old@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: **OBSOLETE** CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Jun 2011 21:00:50 -0000 kib 2011-06-01 21:00:28 UTC FreeBSD src repository Modified files: sys/fs/nfsclient nfs_clbio.c sys/fs/nwfs nwfs_io.c sys/fs/smbfs smbfs_io.c sys/nfsclient nfs_bio.c sys/vm vm_object.c vnode_pager.c vnode_pager.h Log: SVN rev 222586 on 2011-06-01 21:00:28Z by kib In the VOP_PUTPAGES() implementations, change the default error from VM_PAGER_AGAIN to VM_PAGER_ERROR for the uwritten pages. Return VM_PAGER_AGAIN for the partially written page. Always forward at least one page in the loop of vm_object_page_clean(). VM_PAGER_ERROR causes the page reactivation and does not clear the page dirty state, so the write is not lost. The change fixes an infinite loop in vm_object_page_clean() when the filesystem returns permanent errors for some page writes. Reported and tested by: gavin Reviewed by: alc, rmacklem MFC after: 1 week Revision Changes Path 1.23 +4 -11 src/sys/fs/nfsclient/nfs_clbio.c 1.57 +3 -8 src/sys/fs/nwfs/nwfs_io.c 1.57 +3 -8 src/sys/fs/smbfs/smbfs_io.c 1.190 +2 -6 src/sys/nfsclient/nfs_bio.c 1.443 +15 -0 src/sys/vm/vm_object.c 1.265 +18 -1 src/sys/vm/vnode_pager.c 1.22 +3 -0 src/sys/vm/vnode_pager.h