diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 20:31:38 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 20:31:38 -0500 |
| commit | 80c0531514516e43ae118ddf38424e06e5c3cb3c (patch) | |
| tree | 2eef8cf8fdf505b18f83078d1eb41167e98f5b54 /fs/ocfs2/super.c | |
| parent | a457aa6c2bdd743bbbffd3f9e4fdbd8c71f8af1b (diff) | |
| parent | 11b751ae8c8ca3fa24c85bd5a3e51dd9f95cda17 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/mingo/mutex-2.6
Diffstat (limited to 'fs/ocfs2/super.c')
| -rw-r--r-- | fs/ocfs2/super.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c index 48bf7f0ce544..364d64bd5f10 100644 --- a/fs/ocfs2/super.c +++ b/fs/ocfs2/super.c | |||
| @@ -169,7 +169,7 @@ static match_table_t tokens = { | |||
| 169 | */ | 169 | */ |
| 170 | static void ocfs2_write_super(struct super_block *sb) | 170 | static void ocfs2_write_super(struct super_block *sb) |
| 171 | { | 171 | { |
| 172 | if (down_trylock(&sb->s_lock) == 0) | 172 | if (mutex_trylock(&sb->s_lock) != 0) |
| 173 | BUG(); | 173 | BUG(); |
| 174 | sb->s_dirt = 0; | 174 | sb->s_dirt = 0; |
| 175 | } | 175 | } |