From patchwork Sat Nov 26 01:39:39 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "J. Bruce Fields" X-Patchwork-Id: 9448221 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 1075E6071C for ; Sat, 26 Nov 2016 01:39:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0143527AB2 for ; Sat, 26 Nov 2016 01:39:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EA54027D13; Sat, 26 Nov 2016 01:39:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A90A827AB2 for ; Sat, 26 Nov 2016 01:39:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753411AbcKZBjm (ORCPT ); Fri, 25 Nov 2016 20:39:42 -0500 Received: from fieldses.org ([173.255.197.46]:60068 "EHLO fieldses.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753299AbcKZBjl (ORCPT ); Fri, 25 Nov 2016 20:39:41 -0500 Received: by fieldses.org (Postfix, from userid 2815) id 5815550F8; Fri, 25 Nov 2016 20:39:39 -0500 (EST) Date: Fri, 25 Nov 2016 20:39:39 -0500 From: "J. Bruce Fields" To: Eryu Guan Cc: Andreas Dilger , linux-fsdevel , fstests@vger.kernel.org, Linux NFS Mailing List Subject: [PATCH 2/2] dirstress: Allow ESTALE as well as ENOENT Message-ID: <20161126013939.GB32632@fieldses.org> References: <20161123222054.GA7900@fieldses.org> <35420A4E-1698-4743-9523-CBF43F2A2DC6@dilger.ca> <20161125034706.GA20729@fieldses.org> <20161125113511.GI4609@eguan.usersys.redhat.com> <20161126013901.GA32632@fieldses.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20161126013901.GA32632@fieldses.org> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: "J. Bruce Fields" In the NFS case an attempt to chdir out of a removed directory could result in ESTALE, and that should not cause the test to fail. This was causing intermittent failures on generic/011 on NFS. Signed-off-by: J. Bruce Fields --- src/dirstress.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/dirstress.c b/src/dirstress.c index f8f73553a1bc..33a166c51819 100644 --- a/src/dirstress.c +++ b/src/dirstress.c @@ -203,8 +203,10 @@ dirstress( if (verbose) fprintf(stderr,"** [%d] chdir ..\n", pid); error = chdir(".."); if (error) { - /* If this is multithreaded, then expecting a ENOENT here is fine */ - if (nprocs_per_dir > 1 && errno == ENOENT) { + /* If this is multithreaded, then expecting a ENOENT here is fine, + * and ESTALE is normal in the NFS case. */ + if (nprocs_per_dir > 1 && + (errno == ENOENT || errno = ESTALE)) { return 0; } @@ -224,8 +226,10 @@ dirstress( if (verbose) fprintf(stderr,"** [%d] chdir ..\n", pid); error = chdir(".."); if (error) { - /* If this is multithreaded, then expecting a ENOENT here is fine */ - if (nprocs_per_dir > 1 && errno == ENOENT) { + /* If this is multithreaded, then expecting a ENOENT here is fine, + * and ESTALE is normal in the NFS case. */ + if (nprocs_per_dir > 1 && + (errno == ENOENT || errno = ESTALE)) { return 0; }