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 branch 'for-linus' of git://neil.brown.name/md
[pandora-kernel.git]
/
fs
/
ocfs2
/
dir.c
diff --git
a/fs/ocfs2/dir.c
b/fs/ocfs2/dir.c
index
e2878b5
..
8fe4e28
100644
(file)
--- a/
fs/ocfs2/dir.c
+++ b/
fs/ocfs2/dir.c
@@
-1184,8
+1184,7
@@
static int __ocfs2_delete_entry(handle_t *handle, struct inode *dir,
if (pde)
le16_add_cpu(&pde->rec_len,
le16_to_cpu(de->rec_len));
- else
- de->inode = 0;
+ de->inode = 0;
dir->i_version++;
ocfs2_journal_dirty(handle, bh);
goto bail;