From patchwork Sun Apr 10 20:50:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Torvalds X-Patchwork-Id: 8794801 Return-Path: X-Original-To: patchwork-linux-fsdevel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 0784DC0553 for ; Sun, 10 Apr 2016 20:50:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6275320225 for ; Sun, 10 Apr 2016 20:50:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B0D812021A for ; Sun, 10 Apr 2016 20:50:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756783AbcDJUuQ (ORCPT ); Sun, 10 Apr 2016 16:50:16 -0400 Received: from mail-io0-f169.google.com ([209.85.223.169]:33141 "EHLO mail-io0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755784AbcDJUuN (ORCPT ); Sun, 10 Apr 2016 16:50:13 -0400 Received: by mail-io0-f169.google.com with SMTP id o126so164368437iod.0; Sun, 10 Apr 2016 13:50:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date:message-id:subject :from:to:cc; bh=1JptQvTj/9UWn9IscQbxsQN0wN4J2VUG33z68r84nhE=; b=k3sZoUy0sn6zKN6WcPUEN3O9LsiR/k7vJfQbbyTObLJeQQOAXgxg4Iak49mdMjo5oF TfRBclEAeLncNQzHiZw8vOf1tK5dAHZKcezPYpcHAE+i2vaq1dp59/ERPPmgYAXEgskw MKof4Ps8UIFQc5dUGqkC1aiNcgK8arUos4CgrqPCMCjW5A90SDzEspJH2fE9Q8PNZhvy X+aUSauyTD+yUlSKrD+NkW4V8j32NOHqVw974dBUYlyc/coafhUEcjwahVdVaLLE4/Ci gHLrCXkAQD3wLQ/YofVDFBBos7Cd52K71A3DaWzQsnUtYf41WCERR4HdQqYxxKHil5Sf IvXQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux-foundation.org; s=google; h=mime-version:sender:in-reply-to:references:date:message-id:subject :from:to:cc; bh=1JptQvTj/9UWn9IscQbxsQN0wN4J2VUG33z68r84nhE=; b=KkVHEEu7YtnfsgNRPDiJFJY0IdeUupc1V4Kar5W+nlRsF75CeD9vS2BoFISPhMieyq eYhXrPjB9/WYWO9/DANK7lPUB6nTErhktUwDXWzYCGT3REdr4rvJO7ww+4uD2euRq7at mRKvmH1FTEb6b1Kb4yr76WcyRb4b5oU4Trsjw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:sender:in-reply-to:references:date :message-id:subject:from:to:cc; bh=1JptQvTj/9UWn9IscQbxsQN0wN4J2VUG33z68r84nhE=; b=lfHcKzcclYsvuFgnL1P8OU18Ng+G/QP5m9gfroBCPl1kwdrISTfFfBb6kAUMsaUwHb 4+iFAqi6fK4jAWQBBpnIYJCcYslahvLGojkN87RazAv8DDG/AmYq0tSTUN0vFiVx1JZW JrgUEuGITjSNN1/GICgRDWwpgXkho3fAwdZHuuk1g9RMmvja2Mxtwvlp/xbm6q5wVgrM IMNOo32cNw3LFdNPABQ2kv0WGHHtLpoTxsCRXIUZxZpW4BYiHU21s6COKA9WSm3aCwbd plVF7EdYV+IbCSQmf5braugCZ7eSgkxjJh/nMVqB4RlmSFIjnSMyQAgpTtGdFE+OObVa 0TPQ== X-Gm-Message-State: AOPr4FUsY/1+5wUvIe89KIDu9Qu169bjJQs7+OCKJZF1Cx9xw6syMqHj/NC+V8FlSR0KvIlHu6Fy55bbmHXimA== MIME-Version: 1.0 X-Received: by 10.107.47.167 with SMTP id v39mr2176189iov.89.1460321411967; Sun, 10 Apr 2016 13:50:11 -0700 (PDT) Received: by 10.36.93.202 with HTTP; Sun, 10 Apr 2016 13:50:11 -0700 (PDT) In-Reply-To: References: Date: Sun, 10 Apr 2016 13:50:11 -0700 X-Google-Sender-Auth: MY5pEpiF9Gmd5qstLLCLZUQnf3A Message-ID: Subject: Re: [GIT PULL] ext4 bug fixes for 4.6 From: Linus Torvalds To: Greg Thelen Cc: "Theodore Ts'o" , "linux-ext4@vger.kernel.org" , "linux-kernel@vger.kernel.org" , linux-fsdevel Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Spam-Status: No, score=-7.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,T_TVD_MIME_EPI, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On Sun, Apr 10, 2016 at 1:48 PM, Linus Torvalds wrote: > > The attached patch is actually tested and seems to fix the issue. Christ. Now really attached. I'll just go back to bed, because today is just not working out. Maybe things will be better tomorrow. Or maybe I should start drinking, and at least have an excuse. Linus fs/ext4/namei.c | 2 +- fs/readdir.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c index db98f89f737f..c07422d254b6 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c @@ -1107,7 +1107,7 @@ int ext4_htree_fill_tree(struct file *dir_file, __u32 start_hash, } while (1) { - if (signal_pending(current)) { + if (fatal_signal_pending(current)) { err = -ERESTARTSYS; goto errout; } diff --git a/fs/readdir.c b/fs/readdir.c index e69ef3b79787..2b0bb4fb8990 100644 --- a/fs/readdir.c +++ b/fs/readdir.c @@ -248,6 +248,8 @@ static int filldir64(struct dir_context *ctx, const char *name, int namlen, return -EINVAL; dirent = buf->previous; if (dirent) { + if (signal_pending(current)) + return -EINTR; if (__put_user(offset, &dirent->d_off)) goto efault; }