Btrfs: don't warn in btrfs_add_orphan

Josef Bacik · chrismason-xx · commit c9ddec74aa95 · 2011-04-05T01:20:24.000-04:00
When I moved the orphan adding to btrfs_truncate I missed the fact that during
orphan cleanup we just add the orphan items to the orphan list without going
through btrfs_orphan_add, which results in lots of warnings on mount if you have
any orphan items that need to be truncated.  Just remove this warning since it's
ok, this will allow all of the normal space accounting take place.  Thanks,

Signed-off-by: Josef Bacik &lt;josef@redhat.com&gt;
Signed-off-by: Chris Mason &lt;chris.mason@oracle.com&gt;
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
@@ -2220,8 +2220,6 @@ int btrfs_orphan_add(struct btrfs_trans_handle *trans, struct inode *inode)
 			insert = 1;
 #endif
 		insert = 1;
-	} else {
-		WARN_ON(!BTRFS_I(inode)->orphan_meta_reserved);
 	}
 
 	if (!BTRFS_I(inode)->orphan_meta_reserved) {

Original file line number	Diff line number	Diff line change
`@@ -2220,8 +2220,6 @@ int btrfs_orphan_add(struct btrfs_trans_handle trans, struct inode inode)`
`2220`	`2220`	`insert = 1;`
`2221`	`2221`	`#endif`
`2222`	`2222`	`insert = 1;`
`2223`		`- } else {`
`2224`		`- WARN_ON(!BTRFS_I(inode)->orphan_meta_reserved);`
`2225`	`2223`	`}`
`2226`	`2224`
`2227`	`2225`	`if (!BTRFS_I(inode)->orphan_meta_reserved) {`