The patch titled
Subject: ocfs2-sysfile-interfaces-for-online-file-check-v4
has been added to the -mm tree. Its filename is
ocfs2-sysfile-interfaces-for-online-file-check-v4.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/ocfs2-sysfile-interfaces-for-online-file-check-v4.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/ocfs2-sysfile-interfaces-for-online-file-check-v4.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Gang He <ghe@xxxxxxxx>
Subject: ocfs2-sysfile-interfaces-for-online-file-check-v4
Signed-off-by: Gang He <ghe@xxxxxxxx>
Cc: Mark Fasheh <mfasheh@xxxxxxx>
Cc: Joel Becker <jlbec@xxxxxxxxxxxx>
Cc: Junxiao Bi <junxiao.bi@xxxxxxxxxx>
Cc: Joseph Qi <joseph.qi@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/ocfs2/filecheck.c | 11 ++++++-----
fs/ocfs2/filecheck.h | 3 ++-
2 files changed, 8 insertions(+), 6 deletions(-)
diff -puN fs/ocfs2/filecheck.c~ocfs2-sysfile-interfaces-for-online-file-check-v4 fs/ocfs2/filecheck.c
--- a/fs/ocfs2/filecheck.c~ocfs2-sysfile-interfaces-for-online-file-check-v4
+++ a/fs/ocfs2/filecheck.c
@@ -5,7 +5,7 @@
*
* Code which implements online file check.
*
- * Copyright (C) 2015 Novell. All rights reserved.
+ * Copyright (C) 2016 SuSE. All rights reserved.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public
@@ -44,6 +44,7 @@ static const char * const ocfs2_filechec
"FAILED",
"INPROGRESS",
"READONLY",
+ "INJBD",
"INVALIDINO",
"BLOCKECC",
"BLOCKNO",
@@ -86,8 +87,8 @@ struct ocfs2_filecheck_entry {
struct list_head fe_list;
unsigned long fe_ino;
unsigned int fe_type;
- unsigned short fe_done:1;
- unsigned short fe_status:15;
+ unsigned int fe_done:1;
+ unsigned int fe_status:31;
};
struct ocfs2_filecheck_args {
@@ -494,11 +495,11 @@ ocfs2_filecheck_done_entry(struct ocfs2_
spin_unlock(&ent->fs_fcheck->fc_lock);
}
-static unsigned short
+static unsigned int
ocfs2_filecheck_handle(struct super_block *sb,
unsigned long ino, unsigned int flags)
{
- unsigned short ret = OCFS2_FILECHECK_ERR_SUCCESS;
+ unsigned int ret = OCFS2_FILECHECK_ERR_SUCCESS;
struct inode *inode = NULL;
int rc;
diff -puN fs/ocfs2/filecheck.h~ocfs2-sysfile-interfaces-for-online-file-check-v4 fs/ocfs2/filecheck.h
--- a/fs/ocfs2/filecheck.h~ocfs2-sysfile-interfaces-for-online-file-check-v4
+++ a/fs/ocfs2/filecheck.h
@@ -5,7 +5,7 @@
*
* Online file check.
*
- * Copyright (C) 2015 Novell. All rights reserved.
+ * Copyright (C) 2016 SuSE. All rights reserved.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public
@@ -31,6 +31,7 @@ enum {
OCFS2_FILECHECK_ERR_FAILED = 1000, /* Other failure */
OCFS2_FILECHECK_ERR_INPROGRESS, /* In progress */
OCFS2_FILECHECK_ERR_READONLY, /* Read only */
+ OCFS2_FILECHECK_ERR_INJBD, /* Buffer in jbd */
OCFS2_FILECHECK_ERR_INVALIDINO, /* Invalid ino */
OCFS2_FILECHECK_ERR_BLOCKECC, /* Block ecc */
OCFS2_FILECHECK_ERR_BLOCKNO, /* Block number */
_
Patches currently in -mm which might be from ghe@xxxxxxxx are
ocfs2-export-ocfs2_kset-for-online-file-check.patch
ocfs2-sysfile-interfaces-for-online-file-check.patch
ocfs2-sysfile-interfaces-for-online-file-check-v4.patch
ocfs2-create-remove-sysfile-for-online-file-check.patch
ocfs2-check-fix-inode-block-for-online-file-check.patch
ocfs2-check-fix-inode-block-for-online-file-check-v4.patch
ocfs2-add-feature-document-for-online-file-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
