Skip to contentSkip to conversation

Btrfs: make sure NODATACOW also gets NODATASUM set

PATCH In review Josef Bacik 3 participants 4 messages Feb 21, 2013 – Feb 22, 2013 Btrfs file system

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Btrfs: make sure NODATACOW also gets NODATASUM set

A user reported hitting the BUG_ON() in btrfs_finished_ordered_io() where we had csums on a NOCOW extent. This can happen if we have NODATACOW set but not NODATASUM set, which can happen in two cases, either we mount with -o nodatacow and then write into preallocated space, or chattr +C a directory and move a file into that directory. This patch fixes up those two cases and now we should uniformly have NODATACOW and NODATASUM set always. Thanks,

---
 fs/btrfs/inode.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
fs/btrfs/inode.c +4 -2
index 40d49da..5d7ceb5 100644
@@ -5574,7 +5574,8 @@ static struct inode *btrfs_new_inode(struct btrfs_trans_handle *trans,
 		if (btrfs_test_opt(root, NODATASUM))
 			BTRFS_I(inode)->flags |= BTRFS_INODE_NODATASUM;
 		if (btrfs_test_opt(root, NODATACOW))
-			BTRFS_I(inode)->flags |= BTRFS_INODE_NODATACOW;
+			BTRFS_I(inode)->flags |= BTRFS_INODE_NODATACOW |
+				BTRFS_INODE_NODATASUM;
 	}
 
 	insert_inode_hash(inode);
@@ -8069,7 +8070,8 @@ static void fixup_inode_flags(struct inode *dir, struct inode *inode)
 	struct btrfs_inode *b_inode = BTRFS_I(inode);
 
 	if (b_dir->flags & BTRFS_INODE_NODATACOW)
-		b_inode->flags |= BTRFS_INODE_NODATACOW;
+		b_inode->flags |= BTRFS_INODE_NODATACOW |
+			BTRFS_INODE_NODATASUM;
 	else
 		b_inode->flags &= ~BTRFS_INODE_NODATACOW;
 
Signature · 1 line
1.7.7.6
Reviewed-by on v1 1/1
#1 lore raw
Quoted 6 lines · Josef Bacik

A user reported hitting the BUG_ON() in btrfs_finished_ordered_io() where we had csums on a NOCOW extent. This can happen if we have NODATACOW set but not NODATASUM set, which can happen in two cases, either we mount with -o nodatacow and then write into preallocated space, or chattr +C a directory and move a file into that directory. This patch fixes up those two cases and now we should uniformly have NODATACOW and NODATASUM set always. Thanks,

Quoted 37 lines
---
 fs/btrfs/inode.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
fs/btrfs/inode.c +4 -2
index 40d49da..5d7ceb5 100644
@@ -5574,7 +5574,8 @@ static struct inode *btrfs_new_inode(struct btrfs_trans_handle *trans,
 		if (btrfs_test_opt(root, NODATASUM))
 			BTRFS_I(inode)->flags |= BTRFS_INODE_NODATASUM;
 		if (btrfs_test_opt(root, NODATACOW))
-			BTRFS_I(inode)->flags |= BTRFS_INODE_NODATACOW;
+			BTRFS_I(inode)->flags |= BTRFS_INODE_NODATACOW |
+				BTRFS_INODE_NODATASUM;
 	}
 
 	insert_inode_hash(inode);
@@ -8069,7 +8070,8 @@ static void fixup_inode_flags(struct inode *dir, struct inode *inode)
 	struct btrfs_inode *b_inode = BTRFS_I(inode);
 
 	if (b_dir->flags & BTRFS_INODE_NODATACOW)
-		b_inode->flags |= BTRFS_INODE_NODATACOW;
+		b_inode->flags |= BTRFS_INODE_NODATACOW |
+			BTRFS_INODE_NODATASUM;
 	else
 		b_inode->flags &= ~BTRFS_INODE_NODATACOW;
 
Signature · 6 lines
1.7.7.6

--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
#2 lore raw
In reply to Josef Bacik

A few weeks ago I reported a similar bug [1]. It has to do with file renaming. Do you think that it is related? This patch doesn't seem to help.

[1] http://www.mail-archive.com/[email protected]/msg21640.html

Quoted 43 lines · Josef Bacik

A user reported hitting the BUG_ON() in btrfs_finished_ordered_io() where we had csums on a NOCOW extent. This can happen if we have NODATACOW set but not NODATASUM set, which can happen in two cases, either we mount with -o nodatacow and then write into preallocated space, or chattr +C a directory and move a file into that directory. This patch fixes up those two cases and now we should uniformly have NODATACOW and NODATASUM set always. Thanks,

---
 fs/btrfs/inode.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
fs/btrfs/inode.c +4 -3
index 40d49da..5d7ceb5 100644
@@ -5574,7 +5574,8 @@ static struct inode *btrfs_new_inode(struct btrfs_trans_handle *trans,
                if (btrfs_test_opt(root, NODATASUM))
                        BTRFS_I(inode)->flags |= BTRFS_INODE_NODATASUM;
                if (btrfs_test_opt(root, NODATACOW))
-                       BTRFS_I(inode)->flags |= BTRFS_INODE_NODATACOW;
+                       BTRFS_I(inode)->flags |= BTRFS_INODE_NODATACOW |
+                               BTRFS_INODE_NODATASUM;
        }
 
        insert_inode_hash(inode);
@@ -8069,7 +8070,8 @@ static void fixup_inode_flags(struct inode *dir, struct inode *inode)
        struct btrfs_inode *b_inode = BTRFS_I(inode);
 
        if (b_dir->flags & BTRFS_INODE_NODATACOW)
-               b_inode->flags |= BTRFS_INODE_NODATACOW;
+               b_inode->flags |= BTRFS_INODE_NODATACOW |
+                       BTRFS_INODE_NODATASUM;
        else
                b_inode->flags &= ~BTRFS_INODE_NODATACOW;
 
--

1.7.7.6

--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

#3 lore raw
Quoted 3 lines · Marios Titas

A few weeks ago I reported a similar bug [1]. It has to do with file renaming. Do you think that it is related? This patch doesn't seem to help.

Yes, they're related, and I sent you a patch in [1] thread, could you check it?

thanks,
liubo

Quoted 51 lines

[1] http://www.mail-archive.com/[email protected]/msg21640.html

Quoted 39 lines · Josef Bacik

A user reported hitting the BUG_ON() in btrfs_finished_ordered_io() where we had csums on a NOCOW extent. This can happen if we have NODATACOW set but not NODATASUM set, which can happen in two cases, either we mount with -o nodatacow and then write into preallocated space, or chattr +C a directory and move a file into that directory. This patch fixes up those two cases and now we should uniformly have NODATACOW and NODATASUM set always. Thanks,

---
 fs/btrfs/inode.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
fs/btrfs/inode.c +4 -3
index 40d49da..5d7ceb5 100644
@@ -5574,7 +5574,8 @@ static struct inode *btrfs_new_inode(struct btrfs_trans_handle *trans,
                if (btrfs_test_opt(root, NODATASUM))
                        BTRFS_I(inode)->flags |= BTRFS_INODE_NODATASUM;
                if (btrfs_test_opt(root, NODATACOW))
-                       BTRFS_I(inode)->flags |= BTRFS_INODE_NODATACOW;
+                       BTRFS_I(inode)->flags |= BTRFS_INODE_NODATACOW |
+                               BTRFS_INODE_NODATASUM;
        }
 
        insert_inode_hash(inode);
@@ -8069,7 +8070,8 @@ static void fixup_inode_flags(struct inode *dir, struct inode *inode)
        struct btrfs_inode *b_inode = BTRFS_I(inode);
 
        if (b_dir->flags & BTRFS_INODE_NODATACOW)
-               b_inode->flags |= BTRFS_INODE_NODATACOW;
+               b_inode->flags |= BTRFS_INODE_NODATACOW |
+                       BTRFS_INODE_NODATASUM;
        else
                b_inode->flags &= ~BTRFS_INODE_NODATACOW;
 
--

1.7.7.6

Quoted 4 lines

--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html