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 master.kernel.org:/pub/scm/linux/kernel/git/acme/net-2.6
[pandora-kernel.git]
/
fs
/
ocfs2
/
journal.c
diff --git
a/fs/ocfs2/journal.c
b/fs/ocfs2/journal.c
index
f92bf1d
..
fd9734d
100644
(file)
--- a/
fs/ocfs2/journal.c
+++ b/
fs/ocfs2/journal.c
@@
-1493,7
+1493,8
@@
static int ocfs2_queue_orphans(struct ocfs2_super *osb,
if (de->name_len == 2 && !strncmp("..", de->name, 2))
continue;
- iter = ocfs2_iget(osb, le64_to_cpu(de->inode));
+ iter = ocfs2_iget(osb, le64_to_cpu(de->inode),
+ OCFS2_FI_FLAG_NOLOCK);
if (IS_ERR(iter))
continue;