The patch titled Subject: ocfs2: add errno and macro definitions has been removed from the -mm tree. Its filename was ocfs2-add-errno-and-macro-definitions.patch This patch was dropped because an updated version will be merged ------------------------------------------------------ From: Gang He <ghe@xxxxxxxx> 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 <ghe@xxxxxxxx> Cc: Mark Fasheh <mfasheh@xxxxxxxx> Cc: Joel Becker <jlbec@xxxxxxxxxxxx> Cc: Goldwyn Rodrigues <rgoldwyn@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- 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 _ Patches currently in -mm which might be from ghe@xxxxxxxx are ocfs2-filecheck-validate_extent_block-function.patch ocfs2-add-file-extent-block-check.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html