[folded-merged] ocfs2-check-fix-inode-block-for-online-file-check-v4.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     Subject: ocfs2-check-fix-inode-block-for-online-file-check-v4
has been removed from the -mm tree.  Its filename was
     ocfs2-check-fix-inode-block-for-online-file-check-v4.patch

This patch was dropped because it was folded into ocfs2-check-fix-inode-block-for-online-file-check.patch

------------------------------------------------------
From: Gang He <ghe@xxxxxxxx>
Subject: ocfs2-check-fix-inode-block-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/inode.c |   31 +++++++++++++++++++++++++------
 1 file changed, 25 insertions(+), 6 deletions(-)

diff -puN fs/ocfs2/inode.c~ocfs2-check-fix-inode-block-for-online-file-check-v4 fs/ocfs2/inode.c
--- a/fs/ocfs2/inode.c~ocfs2-check-fix-inode-block-for-online-file-check-v4
+++ a/fs/ocfs2/inode.c
@@ -425,7 +425,7 @@ static int ocfs2_read_locked_inode(struc
 	struct ocfs2_super *osb;
 	struct ocfs2_dinode *fe;
 	struct buffer_head *bh = NULL;
-	int status, can_lock;
+	int status, can_lock, lock_level = 0;
 	u32 generation = 0;
 
 	status = -EINVAL;
@@ -493,7 +493,7 @@ static int ocfs2_read_locked_inode(struc
 			mlog_errno(status);
 			return status;
 		}
-		status = ocfs2_inode_lock(inode, NULL, 0);
+		status = ocfs2_inode_lock(inode, NULL, lock_level);
 		if (status) {
 			make_bad_inode(inode);
 			mlog_errno(status);
@@ -563,7 +563,12 @@ static int ocfs2_read_locked_inode(struc
 
 	BUG_ON(args->fi_blkno != le64_to_cpu(fe->i_blkno));
 
-	if (buffer_dirty(bh)) {
+	if (buffer_dirty(bh) && !buffer_jbd(bh)) {
+		if (can_lock) {
+			ocfs2_inode_unlock(inode, lock_level);
+			lock_level = 1;
+			ocfs2_inode_lock(inode, NULL, lock_level);
+		}
 		status = ocfs2_write_block(osb, bh, INODE_CACHE(inode));
 		if (status < 0) {
 			mlog_errno(status);
@@ -575,7 +580,7 @@ static int ocfs2_read_locked_inode(struc
 
 bail:
 	if (can_lock)
-		ocfs2_inode_unlock(inode, 0);
+		ocfs2_inode_unlock(inode, lock_level);
 
 	if (status < 0)
 		make_bad_inode(inode);
@@ -1447,13 +1452,18 @@ static int ocfs2_filecheck_validate_inod
 
 	BUG_ON(!buffer_uptodate(bh));
 
+	/*
+	 * Call ocfs2_validate_meta_ecc() first since it has ecc repair
+	 * function, but we should not return error immediately when ecc
+	 * validation fails, because the reason is quite likely the invalid
+	 * inode number inputed.
+	 */
 	rc = ocfs2_validate_meta_ecc(sb, bh->b_data, &di->i_check);
 	if (rc) {
 		mlog(ML_ERROR,
 		     "Filecheck: checksum failed for dinode %llu\n",
 		     (unsigned long long)bh->b_blocknr);
 		rc = -OCFS2_FILECHECK_ERR_BLOCKECC;
-		goto bail;
 	}
 
 	if (!OCFS2_IS_VALID_DINODE(di)) {
@@ -1462,7 +1472,8 @@ static int ocfs2_filecheck_validate_inod
 		     (unsigned long long)bh->b_blocknr, 7, di->i_signature);
 		rc = -OCFS2_FILECHECK_ERR_INVALIDINO;
 		goto bail;
-	}
+	} else if (rc)
+		goto bail;
 
 	if (le64_to_cpu(di->i_blkno) != bh->b_blocknr) {
 		mlog(ML_ERROR,
@@ -1517,6 +1528,14 @@ static int ocfs2_filecheck_repair_inode_
 		return -OCFS2_FILECHECK_ERR_READONLY;
 	}
 
+	if (buffer_jbd(bh)) {
+		mlog(ML_ERROR,
+		     "Filecheck: cannot repair dinode #%llu, "
+		     "its buffer is in jbd\n",
+		     (unsigned long long)bh->b_blocknr);
+		return -OCFS2_FILECHECK_ERR_INJBD;
+	}
+
 	if (!OCFS2_IS_VALID_DINODE(di)) {
 		/* Cannot fix invalid inode block */
 		return -OCFS2_FILECHECK_ERR_INVALIDINO;
_

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-create-remove-sysfile-for-online-file-check.patch
ocfs2-check-fix-inode-block-for-online-file-check.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



[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux