Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756639AbZLULt2 (ORCPT ); Mon, 21 Dec 2009 06:49:28 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756627AbZLULt1 (ORCPT ); Mon, 21 Dec 2009 06:49:27 -0500 Received: from mail-pw0-f42.google.com ([209.85.160.42]:40518 "EHLO mail-pw0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756625AbZLULt0 (ORCPT ); Mon, 21 Dec 2009 06:49:26 -0500 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:reply-to:user-agent:mime-version:to:subject :content-type:content-transfer-encoding; b=Q41v7D+grF6OMPTlLF5t3c7ZY0ynrcRWUK2X16Qan3DPvmwVZRsgWzikF+9m7dkzN2 yKgmmvsW+Oa/V4sBHCbypG5ZGXsGbdxoxJFiBjrbg2Lg+Y7xSVn4Kc6TtC15a+lQfYxM AY2NNPLj7HjlPynkHmNDvDoKg0UPkuO2sTVvQ= Message-ID: <4B2F619A.8000407@gmail.com> Date: Mon, 21 Dec 2009 19:52:58 +0800 From: Liuwenyi Reply-To: qingshenlwy@gmail.com User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; zh-CN; rv:1.9.1.5) Gecko/20091204 Thunderbird/3.0 MIME-Version: 1.0 To: chris.mason@oracle.com, viro@zeniv.linux.org.uk, joel.becker@oracle.com, cjb@laptop.org, jmorris@namei.org, linux-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org, onlyflyer@gmail.com, strongzgy@gmail.com Subject: [PATCHv2 02/12]posix_acl: Add the check items Content-Type: text/plain; charset=GB2312 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1102 Lines: 46 move the ACL validation check in to fs/posix_acl.c. Including nullpointer check and PTR_ERR check. --- Signed-off-by: Liuwenyi Cc: Chris Mason Cc: Al Viro Cc: Joel Becker Cc: Chris Ball Cc: James Morris Cc: linux-btrfs@vger.kernel.org Cc: linux-kernel@vger.kernel.org --- diff --git a/fs/btrfs/acl.c b/fs/btrfs/acl.c index 2e9e699..0f14f95 100644 --- a/fs/btrfs/acl.c +++ b/fs/btrfs/acl.c @@ -102,12 +102,9 @@ static int btrfs_set_acl(struct btrfs_trans_handle *trans, char *value = NULL; mode_t mode; - if (acl) { - ret = posix_acl_valid(acl); - if (ret < 0) - return ret; - ret = 0; - } + ret = posix_acl_valid(acl); + if (ret < 0) + return ret; switch (type) { case ACL_TYPE_ACCESS: -- Best Regards, Liuwenyi -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/