From patchwork Wed Aug 26 22:12:30 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 7080411 Return-Path: X-Original-To: patchwork-ocfs2-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id AED0D9F358 for ; Wed, 26 Aug 2015 22:12:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C4090208DA for ; Wed, 26 Aug 2015 22:12:43 +0000 (UTC) Received: from userp1040.oracle.com (userp1040.oracle.com [156.151.31.81]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 35C23208E7 for ; Wed, 26 Aug 2015 22:12:42 +0000 (UTC) Received: from userv0021.oracle.com (userv0021.oracle.com [156.151.31.71]) by userp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id t7QMCZkQ007343 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 26 Aug 2015 22:12:35 GMT Received: from oss.oracle.com (oss-old-reserved.oracle.com [137.254.22.2]) by userv0021.oracle.com (8.13.8/8.13.8) with ESMTP id t7QMCYeF007749 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 26 Aug 2015 22:12:35 GMT Received: from localhost ([127.0.0.1] helo=lb-oss.oracle.com) by oss.oracle.com with esmtp (Exim 4.63) (envelope-from ) id 1ZUivq-00071E-Sd; Wed, 26 Aug 2015 15:12:34 -0700 Received: from userv0022.oracle.com ([156.151.31.74]) by oss.oracle.com with esmtp (Exim 4.63) (envelope-from ) id 1ZUivp-00070p-MV for ocfs2-devel@oss.oracle.com; Wed, 26 Aug 2015 15:12:33 -0700 Received: from aserp1020.oracle.com (aserp1020.oracle.com [141.146.126.67]) by userv0022.oracle.com (8.13.8/8.13.8) with ESMTP id t7QMCXxB007420 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 26 Aug 2015 22:12:33 GMT Received: from userp2040.oracle.com (userp2040.oracle.com [156.151.31.90]) by aserp1020.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id t7QMCWeS010216 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Wed, 26 Aug 2015 22:12:32 GMT Received: from pps.filterd (userp2040.oracle.com [127.0.0.1]) by userp2040.oracle.com (8.15.0.59/8.15.0.59) with SMTP id t7QM9geJ042535 for ; Wed, 26 Aug 2015 22:12:32 GMT Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) by userp2040.oracle.com with ESMTP id 1whb7wgwh6-1 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 26 Aug 2015 22:12:32 +0000 Received: from akpm3.mtv.corp.google.com (unknown [216.239.45.65]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 2CD26DF9; Wed, 26 Aug 2015 22:12:31 +0000 (UTC) Date: Wed, 26 Aug 2015 15:12:30 -0700 From: akpm@linux-foundation.org To: ocfs2-devel@oss.oracle.com, akpm@linux-foundation.org, ghe@suse.com, jlbec@evilplan.org, mfasheh@suse.com, rgoldwyn@suse.de Message-ID: <55de39ce.IglWDtn0hR1cOlMU%akpm@linux-foundation.org> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 X-Proofpoint-SPF-Result: pass X-Proofpoint-SPF-Record: v=spf1 ip4:140.211.169.12/30 include:_spf.google.com ~all X-ServerName: mail.linuxfoundation.org X-Proofpoint-Virus-Version: vendor=nai engine=5700 definitions=7905 signatures=670626 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 suspectscore=0 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1507310000 definitions=main-1508260346 Subject: [Ocfs2-devel] [patch 26/28] ocfs2: add errno and macro definitions X-BeenThere: ocfs2-devel@oss.oracle.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: ocfs2-devel-bounces@oss.oracle.com Errors-To: ocfs2-devel-bounces@oss.oracle.com X-Source-IP: userv0021.oracle.com [156.151.31.71] X-Spam-Status: No, score=-5.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 From: Gang He Subject: ocfs2: add errno and macro definitions Add new errno, macro definitions and header file inclusion, which will be used for file extent block online check. Signed-off-by: Gang He Cc: Mark Fasheh Cc: Joel Becker Cc: Goldwyn Rodrigues Signed-off-by: Andrew Morton --- fs/ocfs2/filecheck.c | 4 ++++ fs/ocfs2/filecheck.h | 1 + fs/ocfs2/journal.h | 3 +++ 3 files changed, 8 insertions(+) diff -puN fs/ocfs2/filecheck.c~ocfs2-add-errno-and-macro-definitions fs/ocfs2/filecheck.c --- a/fs/ocfs2/filecheck.c~ocfs2-add-errno-and-macro-definitions +++ a/fs/ocfs2/filecheck.c @@ -31,7 +31,10 @@ #include "ocfs2.h" #include "ocfs2_fs.h" #include "stackglue.h" +#include "dlmglue.h" #include "inode.h" +#include "alloc.h" +#include "journal.h" #include "filecheck.h" @@ -45,6 +48,7 @@ static const char * const ocfs2_filechec "INPROGRESS", "READONLY", "INVALIDINO", + "INVALIDEXT", "BLOCKECC", "BLOCKNO", "VALIDFLAG", diff -puN fs/ocfs2/filecheck.h~ocfs2-add-errno-and-macro-definitions fs/ocfs2/filecheck.h --- a/fs/ocfs2/filecheck.h~ocfs2-add-errno-and-macro-definitions +++ a/fs/ocfs2/filecheck.h @@ -32,6 +32,7 @@ enum { OCFS2_FILECHECK_ERR_INPROGRESS, /* In progress */ OCFS2_FILECHECK_ERR_READONLY, /* Read only */ OCFS2_FILECHECK_ERR_INVALIDINO, /* Invalid ino */ + OCFS2_FILECHECK_ERR_INVALIDEXT, /* Invalid extent block */ OCFS2_FILECHECK_ERR_BLOCKECC, /* Block ecc */ OCFS2_FILECHECK_ERR_BLOCKNO, /* Block number */ OCFS2_FILECHECK_ERR_VALIDFLAG, /* Inode valid flag */ diff -puN fs/ocfs2/journal.h~ocfs2-add-errno-and-macro-definitions fs/ocfs2/journal.h --- a/fs/ocfs2/journal.h~ocfs2-add-errno-and-macro-definitions +++ a/fs/ocfs2/journal.h @@ -350,6 +350,9 @@ void ocfs2_journal_dirty(handle_t *handl /* simple file updates like chmod, etc. */ #define OCFS2_INODE_UPDATE_CREDITS 1 +/* extent block update */ +#define OCFS2_EXTENT_BLOCK_UPDATE_CREDITS 1 + /* extended attribute block update */ #define OCFS2_XATTR_BLOCK_UPDATE_CREDITS 1