diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2010-12-23 02:41:14 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2010-12-23 02:41:14 -0500 |
| commit | cfb13c5db08c90311a5defdde9a0328ee788cca5 (patch) | |
| tree | 842cb60d1d19b99e550fdbc653723e4b13e51ee5 /fs/hpfs/buffer.c | |
| parent | 4b6ba8aacbb3185703b797286547d0f8f3859b02 (diff) | |
| parent | 90a8a73c06cc32b609a880d48449d7083327e11a (diff) | |
Merge commit 'v2.6.37-rc7' into devicetree/next
Diffstat (limited to 'fs/hpfs/buffer.c')
| -rw-r--r-- | fs/hpfs/buffer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/hpfs/buffer.c b/fs/hpfs/buffer.c index eac5f96323e3..793cb9d943d2 100644 --- a/fs/hpfs/buffer.c +++ b/fs/hpfs/buffer.c | |||
| @@ -14,7 +14,7 @@ void hpfs_lock_creation(struct super_block *s) | |||
| 14 | #ifdef DEBUG_LOCKS | 14 | #ifdef DEBUG_LOCKS |
| 15 | printk("lock creation\n"); | 15 | printk("lock creation\n"); |
| 16 | #endif | 16 | #endif |
| 17 | down(&hpfs_sb(s)->hpfs_creation_de); | 17 | mutex_lock(&hpfs_sb(s)->hpfs_creation_de); |
| 18 | } | 18 | } |
| 19 | 19 | ||
| 20 | void hpfs_unlock_creation(struct super_block *s) | 20 | void hpfs_unlock_creation(struct super_block *s) |
| @@ -22,7 +22,7 @@ void hpfs_unlock_creation(struct super_block *s) | |||
| 22 | #ifdef DEBUG_LOCKS | 22 | #ifdef DEBUG_LOCKS |
| 23 | printk("unlock creation\n"); | 23 | printk("unlock creation\n"); |
| 24 | #endif | 24 | #endif |
| 25 | up(&hpfs_sb(s)->hpfs_creation_de); | 25 | mutex_unlock(&hpfs_sb(s)->hpfs_creation_de); |
| 26 | } | 26 | } |
| 27 | 27 | ||
| 28 | /* Map a sector into a buffer and return pointers to it and to the buffer. */ | 28 | /* Map a sector into a buffer and return pointers to it and to the buffer. */ |