From patchwork Fri Apr 28 13:13:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chao Yu X-Patchwork-Id: 9704687 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 6B46A602BE for ; Fri, 28 Apr 2017 13:15:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5D24128389 for ; Fri, 28 Apr 2017 13:15:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5065E28687; Fri, 28 Apr 2017 13:15:26 +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 7825728389 for ; Fri, 28 Apr 2017 13:15:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753723AbdD1NPZ (ORCPT ); Fri, 28 Apr 2017 09:15:25 -0400 Received: from mail.kernel.org ([198.145.29.136]:56166 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753520AbdD1NPY (ORCPT ); Fri, 28 Apr 2017 09:15:24 -0400 Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4970B202FF; Fri, 28 Apr 2017 13:15:23 +0000 (UTC) Received: from localhost.localdomain (unknown [218.94.45.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 2293920306; Fri, 28 Apr 2017 13:15:19 +0000 (UTC) From: Chao Yu To: fstests@vger.kernel.org, eguan@redhat.com Cc: jaegeuk@kernel.org, linux-f2fs-devel@lists.sourceforge.net, Chao Yu Subject: [PATCH] attr: adbjust acl_max of f2fs Date: Fri, 28 Apr 2017 21:13:07 +0800 Message-Id: <20170428131307.3384-1-chao@kernel.org> X-Mailer: git-send-email 2.12.2.575.gb14f27f X-Virus-Scanned: ClamAV using ClamSMTP Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Chao Yu f2fs has set inline_xattr as a default option, and introduced a new option named 'noinline_xattr' for disabling default inline_xattr option. So in _acl_get_max we need to check 'noinline_xattr' string in fs option, otherwise we may select the wrong max acl number since we always found the string 'ininline_xattr' in fs option. Additionally, f2fs has changed disk layout of xattr block a bit, so will contain one more entry in both inline and noinline xattr inode, this patch will modify the max acl number to adjust it. Signed-off-by: Chao Yu --- common/attr | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/common/attr b/common/attr index ac139e61..6d4f68ed 100644 --- a/common/attr +++ b/common/attr @@ -43,11 +43,11 @@ _acl_get_max() echo 8191 ;; f2fs) - _fs_options $TEST_DEV | grep "inline_xattr" >/dev/null 2>&1 + _fs_options $TEST_DEV | grep "noinline_xattr" >/dev/null 2>&1 if [ $? -eq 0 ]; then - echo 531 + echo 507 else - echo 506 + echo 532 fi ;; *)