git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote branch 'nouveau/drm-nouveau-next' of /ssd/git/drm-nouveau-next into...
[pandora-kernel.git]
/
fs
/
btrfs
/
dir-item.c
diff --git
a/fs/btrfs/dir-item.c
b/fs/btrfs/dir-item.c
index
e9103b3
..
f0cad5a
100644
(file)
--- a/
fs/btrfs/dir-item.c
+++ b/
fs/btrfs/dir-item.c
@@
-427,5
+427,5
@@
int btrfs_delete_one_dir_name(struct btrfs_trans_handle *trans,
ret = btrfs_truncate_item(trans, root, path,
item_len - sub_item_len, 1);
}
ret = btrfs_truncate_item(trans, root, path,
item_len - sub_item_len, 1);
}
- return
0
;
+ return
ret
;
}
}