fs/ntfs3: Unify inode corruption marking with _ntfs_bad_inode()

Also reworked error handling in a couple of places.

Signed-off-by: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>

diff --git a/fs/ntfs3/attrib.c b/fs/ntfs3/attrib.c
index 795cf8e75d2ea368a01df8a7254cd946f09441c8..af94e3737470d86740a6cc77483bfb924573475f 100644 (file)
--- a/fs/ntfs3/attrib.c
+++ b/fs/ntfs3/attrib.c
@@ -1407,7 +1407,7 @@ int attr_wof_frame_info(struct ntfs_inode *ni, struct ATTRIB *attr,
         */
        if (!attr->non_res) {
                if (vbo[1] + bytes_per_off > le32_to_cpu(attr->res.data_size)) {
-                       ntfs_inode_err(&ni->vfs_inode, "is corrupted");
+                       _ntfs_bad_inode(&ni->vfs_inode);
                        return -EINVAL;
                }
                addr = resident_data(attr);
@@ -2588,7 +2588,7 @@ int attr_force_nonresident(struct ntfs_inode *ni)
 
        attr = ni_find_attr(ni, NULL, &le, ATTR_DATA, NULL, 0, NULL, &mi);
        if (!attr) {
-               ntfs_bad_inode(&ni->vfs_inode, "no data attribute");
+               _ntfs_bad_inode(&ni->vfs_inode);
                return -ENOENT;
        }
 

diff --git a/fs/ntfs3/dir.c b/fs/ntfs3/dir.c
index fc6a8aa29e3afe0c864a42f717143a811d0dd6cd..b6da80c69ca634f61aeb8ee003175c85d2ce51af 100644 (file)
--- a/fs/ntfs3/dir.c
+++ b/fs/ntfs3/dir.c
@@ -512,7 +512,7 @@ out:
                ctx->pos = pos;
        } else if (err < 0) {
                if (err == -EINVAL)
-                       ntfs_inode_err(dir, "directory corrupted");
+                       _ntfs_bad_inode(dir);
                ctx->pos = eod;
        }
 

diff --git a/fs/ntfs3/frecord.c b/fs/ntfs3/frecord.c
index b6be7dfafcbd0517bc39c59385b4e2f434104823..5df6a0b5add90e99da8962c0aa09995f28bf3fd6 100644 (file)
--- a/fs/ntfs3/frecord.c
+++ b/fs/ntfs3/frecord.c
@@ -148,8 +148,10 @@ int ni_load_mi_ex(struct ntfs_inode *ni, CLST rno, struct mft_inode **mi)
                goto out;
 
        err = mi_get(ni->mi.sbi, rno, &r);
-       if (err)
+       if (err) {
+               _ntfs_bad_inode(&ni->vfs_inode);
                return err;
+       }
 
        ni_add_mi(ni, r);
 
@@ -239,8 +241,7 @@ struct ATTRIB *ni_find_attr(struct ntfs_inode *ni, struct ATTRIB *attr,
        return attr;
 
 out:
-       ntfs_inode_err(&ni->vfs_inode, "failed to parse mft record");
-       ntfs_set_state(ni->mi.sbi, NTFS_DIRTY_ERROR);
+       _ntfs_bad_inode(&ni->vfs_inode);
        return NULL;
 }
 
@@ -332,6 +333,7 @@ struct ATTRIB *ni_load_attr(struct ntfs_inode *ni, enum ATTR_TYPE type,
            vcn <= le64_to_cpu(attr->nres.evcn))
                return attr;
 
+       _ntfs_bad_inode(&ni->vfs_inode);
        return NULL;
 }
 
@@ -1607,8 +1609,8 @@ int ni_delete_all(struct ntfs_inode *ni)
                roff = le16_to_cpu(attr->nres.run_off);
 
                if (roff > asize) {
-                       _ntfs_bad_inode(&ni->vfs_inode);
-                       return -EINVAL;
+                       /* ni_enum_attr_ex checks this case. */
+                       continue;
                }
 
                /* run==1 means unpack and deallocate. */

diff --git a/fs/ntfs3/fsntfs.c b/fs/ntfs3/fsntfs.c
index 03471bc9371cd1bc4fd7cd29a023efd64072db0f..938d351ebac721646cd0f0c69979964491679c70 100644 (file)
--- a/fs/ntfs3/fsntfs.c
+++ b/fs/ntfs3/fsntfs.c
@@ -908,7 +908,11 @@ void ntfs_bad_inode(struct inode *inode, const char *hint)
 
        ntfs_inode_err(inode, "%s", hint);
        make_bad_inode(inode);
-       ntfs_set_state(sbi, NTFS_DIRTY_ERROR);
+       /* Avoid recursion if bad inode is $Volume. */
+       if (inode->i_ino != MFT_REC_VOL &&
+           !(sbi->flags & NTFS_FLAGS_LOG_REPLAYING)) {
+               ntfs_set_state(sbi, NTFS_DIRTY_ERROR);
+       }
 }
 
 /*

diff --git a/fs/ntfs3/index.c b/fs/ntfs3/index.c
index 9089c58a005ce1b51d0ec291f1dbc6f4b4b0d153..7eb9fae22f8da6cb3f6c47a7c4c42af9e3c0cf0f 100644 (file)
--- a/fs/ntfs3/index.c
+++ b/fs/ntfs3/index.c
@@ -1094,8 +1094,7 @@ int indx_read(struct ntfs_index *indx, struct ntfs_inode *ni, CLST vbn,
 
 ok:
        if (!index_buf_check(ib, bytes, &vbn)) {
-               ntfs_inode_err(&ni->vfs_inode, "directory corrupted");
-               ntfs_set_state(ni->mi.sbi, NTFS_DIRTY_ERROR);
+               _ntfs_bad_inode(&ni->vfs_inode);
                err = -EINVAL;
                goto out;
        }
@@ -1117,8 +1116,7 @@ ok:
 
 out:
        if (err == -E_NTFS_CORRUPT) {
-               ntfs_inode_err(&ni->vfs_inode, "directory corrupted");
-               ntfs_set_state(ni->mi.sbi, NTFS_DIRTY_ERROR);
+               _ntfs_bad_inode(&ni->vfs_inode);
                err = -EINVAL;
        }
 

diff --git a/fs/ntfs3/inode.c b/fs/ntfs3/inode.c
index be04d2845bb7bc6abf0e58816edce1862059efdb..a1e11228dafd02e7ec34b8eba8c88cd2a1487b8e 100644 (file)
--- a/fs/ntfs3/inode.c
+++ b/fs/ntfs3/inode.c
@@ -410,6 +410,9 @@ end_enum:
        if (!std5)
                goto out;
 
+       if (is_bad_inode(inode))
+               goto out;
+
        if (!is_match && name) {
                err = -ENOENT;
                goto out;