diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-02-25 21:41:34 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-02-25 21:41:34 +0100 |
| commit | 2a2d10f386c1bacabe1a530c06dc8488eac419e5 (patch) | |
| tree | 4606a4a3bafa42a8aa70e001d35883956a0f0589 /fs/ocfs2/journal.c | |
| parent | Merge branch 'arm/clock-event' of git://git.pengutronix.de/git/ukl/linux-2.6 ... (diff) | |
| parent | [ARM] MV78xx0: Support for Buffalo WXL (Terastation Duo) (diff) | |
| download | linux-2a2d10f386c1bacabe1a530c06dc8488eac419e5.tar.xz linux-2a2d10f386c1bacabe1a530c06dc8488eac419e5.zip | |
Merge branch 'for-rmk' of git://git.marvell.com/orion into devel-stable
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, status = -ENOENT; mlog_errno(status); return status; - } + } mutex_lock(&orphan_dir_inode->i_mutex); status = ocfs2_inode_lock(orphan_dir_inode, NULL, 0); |