From patchwork Wed Mar 31 10:44:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Bader X-Patchwork-Id: 1460471 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4F9NGm5MrJz9sW4; Wed, 31 Mar 2021 21:44:15 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1lRYKW-0000zx-HU; Wed, 31 Mar 2021 10:44:08 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1lRYKU-0000zr-UX for kernel-team@lists.ubuntu.com; Wed, 31 Mar 2021 10:44:06 +0000 Received: from 1.general.smb.uk.vpn ([10.172.193.28] helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1lRYKU-0006rF-Kl for kernel-team@lists.ubuntu.com; Wed, 31 Mar 2021 10:44:06 +0000 From: Stefan Bader To: kernel-team@lists.ubuntu.com Subject: [SRU Xenial][PATCH] UBUNTU: SAUCE: Fix fuse regression in 4.4.0-207.239 Date: Wed, 31 Mar 2021 12:44:06 +0200 Message-Id: <20210331104406.177696-1-stefan.bader@canonical.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1921969 When converting fuse_do_setattr() to take a denry instead of an inode as argument, there was one call to it missed in fuse_setattr(). This adds the missing conversion. Fixes: b3ce51efc535 "fuse: Propagate dentry down to inode_change_ok()" Signed-off-by: Stefan Bader Acked-by: Kleber Sacilotto de Souza Acked-by: Colin Ian King --- fs/fuse/dir.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c index 3456f6861293..6413273e42f7 100644 --- a/fs/fuse/dir.c +++ b/fs/fuse/dir.c @@ -1769,7 +1769,7 @@ static int fuse_setattr(struct dentry *entry, struct iattr *attr) if (!attr->ia_valid) return 0; - ret = fuse_do_setattr(inode, attr, file); + ret = fuse_do_setattr(entry, attr, file); if (!ret) { /* Directory mode changed, may need to revalidate access */ if (d_is_dir(entry) && (attr->ia_valid & ATTR_MODE))