From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: linux-nfs-owner@vger.kernel.org Received: from mx1.redhat.com ([209.132.183.28]:55040 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754157Ab1JSPed (ORCPT ); Wed, 19 Oct 2011 11:34:33 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p9JFYXxU021082 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 19 Oct 2011 11:34:33 -0400 Received: from bighat.boston.devel.redhat.com (bighat.boston.devel.redhat.com [10.16.60.55]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p9JFYWDT009555 for ; Wed, 19 Oct 2011 11:34:32 -0400 From: Steve Dickson To: Linux NFS Mailing list Subject: [PATCH 1/1] mount.nfs: mtab corruption when RLIMIT_FSIZE causes a partial write Date: Wed, 19 Oct 2011 11:34:30 -0400 Message-Id: <1319038470-17750-1-git-send-email-steved@redhat.com> Sender: linux-nfs-owner@vger.kernel.org List-ID: This patch is a following on to commit 7a802337. Using the tool in https://bugzilla.redhat.com/show_bug.cgi?id=695916 caused the fflush() and fclose() to fail in turn causing corruption in the mtab. The failures were in the internals of both calls. Switch those calls with the actual system calls eliminated the failures. Signed-off-by: Steve Dickson --- support/nfs/nfs_mntent.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/support/nfs/nfs_mntent.c b/support/nfs/nfs_mntent.c index a2118a2..b80f270 100644 --- a/support/nfs/nfs_mntent.c +++ b/support/nfs/nfs_mntent.c @@ -117,7 +117,7 @@ void nfs_endmntent (mntFILE *mfp) { if (mfp) { if (mfp->mntent_fp) - fclose(mfp->mntent_fp); + close(fileno(mfp->mntent_fp)); if (mfp->mntent_file) free(mfp->mntent_file); free(mfp); @@ -147,7 +147,7 @@ nfs_addmntent (mntFILE *mfp, struct mntent *mnt) { free(m3); free(m4); if (res >= 0) { - res = fflush(mfp->mntent_fp); + res = fsync(fileno(mfp->mntent_fp)); if (res < 0) /* Avoid leaving a corrupt mtab file */ ftruncate(fileno(mfp->mntent_fp), length); -- 1.7.6.2