summaryrefslogtreecommitdiffstats
path: root/fs/btrfs/inode.c
diff options
context:
space:
mode:
authorYan2007-10-25 21:48:28 +0200
committerChris Mason2008-09-25 17:03:57 +0200
commit0d9f7f3e27a92b07212090a1772fdbb3a92fef81 (patch)
treeb8922ebb34225f70b7a51fe53ad1fdd91ae2647b /fs/btrfs/inode.c
parentBtrfs: Tune the automatic defrag code (diff)
downloadkernel-qcow2-linux-0d9f7f3e27a92b07212090a1772fdbb3a92fef81.tar.gz
kernel-qcow2-linux-0d9f7f3e27a92b07212090a1772fdbb3a92fef81.tar.xz
kernel-qcow2-linux-0d9f7f3e27a92b07212090a1772fdbb3a92fef81.zip
btrfs_inode_by_name return random value.
When inode is found, the return value is from the uninitialized variable 'ret'. -- Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/inode.c')
-rw-r--r--fs/btrfs/inode.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index c07433072322..b74a831fab19 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -847,15 +847,16 @@ static int btrfs_inode_by_name(struct inode *dir, struct dentry *dentry,
struct btrfs_dir_item *di;
struct btrfs_path *path;
struct btrfs_root *root = BTRFS_I(dir)->root;
- int ret;
+ int ret = 0;
path = btrfs_alloc_path();
BUG_ON(!path);
di = btrfs_lookup_dir_item(NULL, root, path, dir->i_ino, name,
namelen, 0);
+ if (IS_ERR(di))
+ ret = PTR_ERR(di);
if (!di || IS_ERR(di)) {
location->objectid = 0;
- ret = 0;
goto out;
}
btrfs_dir_item_key_to_cpu(path->nodes[0], di, location);