Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 262239
b: refs/heads/master
c: 77906a5
h: refs/heads/master
i:
  262237: 2c78f9d
  262235: 6cef01e
  262231: ba84089
  262223: 6c2068a
  262207: 796a868
v: v3
  • Loading branch information
Li Zefan authored and Chris Mason committed Aug 1, 2011
1 parent 2f60a20 commit cc2760f
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b783e62d9620445d1ca3de76badf0468cdd329ba
refs/heads/master: 77906a5075a4eb767026c2e07b1a412d08aea5be
3 changes: 1 addition & 2 deletions trunk/fs/btrfs/ioctl.c
Original file line number Diff line number Diff line change
Expand Up @@ -1757,11 +1757,10 @@ static noinline int btrfs_search_path_in_tree(struct btrfs_fs_info *info,
key.objectid = key.offset;
key.offset = (u64)-1;
dirid = key.objectid;

}
if (ptr < name)
goto out;
memcpy(name, ptr, total_len);
memmove(name, ptr, total_len);
name[total_len]='\0';
ret = 0;
out:
Expand Down

0 comments on commit cc2760f

Please sign in to comment.