diff options
| author | David S. Miller <davem@davemloft.net> | 2010-02-17 19:20:14 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-17 19:20:14 -0500 |
| commit | 8c2fcadc933f713d51f46ec4dcd9b12830e0df84 (patch) | |
| tree | e0797b2db664d702f9d02dd0f45efddb2f0d7fe9 /fs/ocfs2/journal.c | |
| parent | 232486e1e9f34889424b68ee6270440b554479a2 (diff) | |
| parent | b0483e78e5c4c9871fc5541875b3bc006846d46b (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
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); |