diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-04 00:21:40 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-04 00:21:40 +0100 |
| commit | d1ffa5669cd834f901141756e63195f48c1bfbf9 (patch) | |
| tree | f0bed266c1f3fef528bbced56b48aac63e0a26b1 /fs/ocfs2/inode.c | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| parent | [PATCH] ocfs2: don't wait on recovery when locking journal (diff) | |
| download | linux-d1ffa5669cd834f901141756e63195f48c1bfbf9.tar.xz linux-d1ffa5669cd834f901141756e63195f48c1bfbf9.zip | |
Merge branch 'upstream-linus' of git://oss.oracle.com/home/sourcebo/git/ocfs2
Diffstat (limited to 'fs/ocfs2/inode.c')
| -rw-r--r-- | fs/ocfs2/inode.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/ocfs2/inode.c b/fs/ocfs2/inode.c index d4ecc0627716..8122489c5762 100644 --- a/fs/ocfs2/inode.c +++ b/fs/ocfs2/inode.c @@ -903,10 +903,10 @@ void ocfs2_clear_inode(struct inode *inode) "Clear inode of %"MLFu64", inode is locked\n", oi->ip_blkno); - mlog_bug_on_msg(down_trylock(&oi->ip_io_sem), - "Clear inode of %"MLFu64", io_sem is locked\n", + mlog_bug_on_msg(!mutex_trylock(&oi->ip_io_mutex), + "Clear inode of %"MLFu64", io_mutex is locked\n", oi->ip_blkno); - up(&oi->ip_io_sem); + mutex_unlock(&oi->ip_io_mutex); /* * down_trylock() returns 0, down_write_trylock() returns 1 |