Received: by 2002:a25:7ec1:0:0:0:0:0 with SMTP id z184csp138357ybc; Mon, 18 Nov 2019 22:01:03 -0800 (PST) X-Google-Smtp-Source: APXvYqzTBUDfdbM5zM0oJZmOAEZKZWB2hzX5f1tttIU8Ha4W1Vt4yHbcTCqdWB07iJMbF3D0aq4C X-Received: by 2002:a17:906:1a47:: with SMTP id j7mr32120449ejf.232.1574143262820; Mon, 18 Nov 2019 22:01:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574143262; cv=none; d=google.com; s=arc-20160816; b=Y7sxY2Cv5cwzVfxjMl7LqfPLLefx30H++elrbfmsaLQCBaFgJm75K87AZ4Q4R/kF0m OWkdKSiRjt84I+lr0N05bTqqX7uWjy+1OU/rFNLsxAhGvkmgEHgFNBcK1zcy9dKQr6Xs KwtkcFMqIxQJhNAAHmdGiXpRKGNPn40bXhfvAqlpEe9+esuiGPo0yF+ILvsIJZOJX3RV QG9mH4hWYhInCSvDeR7nAiqkwWrGXxPCo888z337yMSQUMVg2c0zXZOmtbfWUj6sAXyk GkyrgMI6n5sTBaqZwD+zanTidlXOrhkFw6/AFbIcxfSTsTgvU0USnxO5HWfUmAjffiFB sQtA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=pI/xjKgAESe/QeoXOwDrTM8AcydSVw6lBflgw9povUc=; b=RuJ+uCx5MNcnA3r8sJaHWoY4aXmZo+ceRf2wNI8hzuBaN6wphcBZJcQ03l+I+ikb52 7CtuV6lXJIwd4bhXEhZlZXaQtrBTbBIYo5PxqUwtI+mqq7fk/rNO9JweEb4Lkfb851XX uXgPPLGPTz9yXlgxV24+BZlSwJgYuk/gF6vZvhJCzbdI9UyoI5nYWJ3M1dYtmyqfJqsh 1hYtKfTHUtjcmqHwWrqclGZP8dFn/fyQHSviof3uHIaq72TzKWBr0zT11MAakEltm93c fkqfvafHv0uadME83Xdjt121eRufbvFVuWJG/Ptkfgr7OZJS7rEMq7bdfNIn8R/viUaK v6wQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=gygFPFcv; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 8si13821349ejc.104.2019.11.18.22.00.39; Mon, 18 Nov 2019 22:01:02 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=gygFPFcv; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731640AbfKSF4Z (ORCPT + 99 others); Tue, 19 Nov 2019 00:56:25 -0500 Received: from mail.kernel.org ([198.145.29.99]:51478 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731434AbfKSFxc (ORCPT ); Tue, 19 Nov 2019 00:53:32 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 341EE21850; Tue, 19 Nov 2019 05:53:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574142811; bh=bVMv+VSCtv3ibr0RRhSJn4llcPqadPJWMmNcIO/xb9Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gygFPFcvzQ19AamY9xxIFhffJoUYH6Fvh2zuyqbe8PuJiVvkPRcb0VjaQcF9R1utc dGVlFcZ91luycb9rSWHLF9bmMbXv5uGXvO3YFGrB+HlcESNteDqdIdU1imHxXdZCBK BLoKmC6pUcxoF0hdf1nSMy9Tm3P4ommWyaHo3hkE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Chao Yu , Jaegeuk Kim , Sasha Levin Subject: [PATCH 4.14 207/239] f2fs: fix to recover inodes project id during POR Date: Tue, 19 Nov 2019 06:20:07 +0100 Message-Id: <20191119051337.345900093@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051255.850204959@linuxfoundation.org> References: <20191119051255.850204959@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Chao Yu [ Upstream commit f4474aa6e5e901ee4af21f39f1b9115aaaaec503 ] Testcase to reproduce this bug: 1. mkfs.f2fs -O extra_attr -O project_quota /dev/sdd 2. mount -t f2fs /dev/sdd /mnt/f2fs 3. touch /mnt/f2fs/file 4. sync 5. chattr -p 1 /mnt/f2fs/file 6. xfs_io -f /mnt/f2fs/file -c "fsync" 7. godown /mnt/f2fs 8. umount /mnt/f2fs 9. mount -t f2fs /dev/sdd /mnt/f2fs 10. lsattr -p /mnt/f2fs/file 0 -----------------N- /mnt/f2fs/file But actually, we expect the correct result is: 1 -----------------N- /mnt/f2fs/file The reason is we didn't recover inode.i_projid field during mount, fix it. Signed-off-by: Chao Yu Signed-off-by: Jaegeuk Kim Signed-off-by: Sasha Levin --- fs/f2fs/recovery.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/fs/f2fs/recovery.c b/fs/f2fs/recovery.c index adbf2600c0908..87942cf2afe1f 100644 --- a/fs/f2fs/recovery.c +++ b/fs/f2fs/recovery.c @@ -203,6 +203,19 @@ static void recover_inode(struct inode *inode, struct page *page) inode->i_mode = le16_to_cpu(raw->i_mode); i_uid_write(inode, le32_to_cpu(raw->i_uid)); i_gid_write(inode, le32_to_cpu(raw->i_gid)); + + if (raw->i_inline & F2FS_EXTRA_ATTR) { + if (f2fs_sb_has_project_quota(F2FS_I_SB(inode)->sb) && + F2FS_FITS_IN_INODE(raw, le16_to_cpu(raw->i_extra_isize), + i_projid)) { + projid_t i_projid; + + i_projid = (projid_t)le32_to_cpu(raw->i_projid); + F2FS_I(inode)->i_projid = + make_kprojid(&init_user_ns, i_projid); + } + } + f2fs_i_size_write(inode, le64_to_cpu(raw->i_size)); inode->i_atime.tv_sec = le64_to_cpu(raw->i_atime); inode->i_ctime.tv_sec = le64_to_cpu(raw->i_ctime); -- 2.20.1