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 commit 'v2.6.31-rc1' into dmaengine
[pandora-kernel.git]
/
fs
/
jffs2
/
readinode.c
diff --git
a/fs/jffs2/readinode.c
b/fs/jffs2/readinode.c
index
1fc1e92
..
1a80301
100644
(file)
--- a/
fs/jffs2/readinode.c
+++ b/
fs/jffs2/readinode.c
@@
-1424,7
+1424,6
@@
void jffs2_do_clear_inode(struct jffs2_sb_info *c, struct jffs2_inode_info *f)
struct jffs2_full_dirent *fd, *fds;
int deleted;
- jffs2_clear_acl(f);
jffs2_xattr_delete_inode(c, f->inocache);
mutex_lock(&f->sem);
deleted = f->inocache && !f->inocache->pino_nlink;