aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulia Lawall <julia@diku.dk>2011-05-14 03:10:51 -0400
committerChris Mason <chris.mason@oracle.com>2011-05-23 13:24:41 -0400
commitb083916638eee513be501f53b42a4be0b9851db0 (patch)
treeb62c38c87d368ca1e5cc5be067094ba82e6bf8a0
parent37daa4f968e9470ae9f30e246a5781717c598271 (diff)
fs/btrfs: Add missing btrfs_free_path
Btrfs_alloc_path should be matched with btrfs_free_path in error-handling code. A simplified version of the semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // <smpl> @r exists@ local idexpression struct btrfs_path * x; expression ra,rb; position p1,p2; @@ x = btrfs_alloc_path@p1(...) ... when != btrfs_free_path(x,...) when != if (...) { ... btrfs_free_path(x,...) ...} when != x = ra if(...) { ... when != x = rb when forall when != btrfs_free_path(x,...) \(return <+...x...+>; \| return@p2...; \) } @script:python@ p1 << r.p1; p2 << r.p2; @@ cocci.print_main("alloc",p1) cocci.print_secs("return",p2) // </smpl> Signed-off-by: Julia Lawall <julia@diku.dk> Signed-off-by: Chris Mason <chris.mason@oracle.com>
-rw-r--r--fs/btrfs/inode.c1
-rw-r--r--fs/btrfs/super.c4
2 files changed, 4 insertions, 1 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index e9e2b4778279..80fcd5177731 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -7314,6 +7314,7 @@ static int btrfs_symlink(struct inode *dir, struct dentry *dentry,
7314 datasize); 7314 datasize);
7315 if (err) { 7315 if (err) {
7316 drop_inode = 1; 7316 drop_inode = 1;
7317 btrfs_free_path(path);
7317 goto out_unlock; 7318 goto out_unlock;
7318 } 7319 }
7319 leaf = path->nodes[0]; 7320 leaf = path->nodes[0];
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index 0ac712efcdf2..46d7eed7e965 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -506,8 +506,10 @@ static struct dentry *get_default_root(struct super_block *sb,
506 */ 506 */
507 dir_id = btrfs_super_root_dir(&root->fs_info->super_copy); 507 dir_id = btrfs_super_root_dir(&root->fs_info->super_copy);
508 di = btrfs_lookup_dir_item(NULL, root, path, dir_id, "default", 7, 0); 508 di = btrfs_lookup_dir_item(NULL, root, path, dir_id, "default", 7, 0);
509 if (IS_ERR(di)) 509 if (IS_ERR(di)) {
510 btrfs_free_path(path);
510 return ERR_CAST(di); 511 return ERR_CAST(di);
512 }
511 if (!di) { 513 if (!di) {
512 /* 514 /*
513 * Ok the default dir item isn't there. This is weird since 515 * Ok the default dir item isn't there. This is weird since