diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-02-16 18:00:42 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-02-16 18:00:42 -0500 |
| commit | ec144a81ade915b5b38adedf10e84690813ed768 (patch) | |
| tree | c94b53c971ab2c39e27433267318b3c7bc86ff1b /fs/ocfs2/journal.c | |
| parent | b919ee827e048826786fd7e889a2b04f63382fe6 (diff) | |
| parent | 88626272549b94310975932a9970d11a9b362a16 (diff) | |
Merge commit 'origin/master' into next
Diffstat (limited to 'fs/ocfs2/journal.c')
| -rw-r--r-- | fs/ocfs2/journal.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ocfs2/journal.c b/fs/ocfs2/journal.c index bf34c491ae96..9336c60e3a36 100644 --- a/fs/ocfs2/journal.c +++ b/fs/ocfs2/journal.c | |||
| @@ -2034,7 +2034,7 @@ static int ocfs2_queue_orphans(struct ocfs2_super *osb, | |||
| 2034 | status = -ENOENT; | 2034 | status = -ENOENT; |
| 2035 | mlog_errno(status); | 2035 | mlog_errno(status); |
| 2036 | return status; | 2036 | return status; |
| 2037 | } | 2037 | } |
| 2038 | 2038 | ||
| 2039 | mutex_lock(&orphan_dir_inode->i_mutex); | 2039 | mutex_lock(&orphan_dir_inode->i_mutex); |
| 2040 | status = ocfs2_inode_lock(orphan_dir_inode, NULL, 0); | 2040 | status = ocfs2_inode_lock(orphan_dir_inode, NULL, 0); |