diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
| commit | 1ebbe2b20091d306453a5cf480a87e6cd28ae76f (patch) | |
| tree | f5cd7a0fa69b8b1938cb5a0faed2e7b0628072a5 /fs/ntfs/compress.c | |
| parent | ac58c9059da8886b5e8cde012a80266b18ca146e (diff) | |
| parent | 674a396c6d2ba0341ebdd7c1c9950f32f018e2dd (diff) | |
Merge branch 'linus'
Diffstat (limited to 'fs/ntfs/compress.c')
| -rw-r--r-- | fs/ntfs/compress.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ntfs/compress.c b/fs/ntfs/compress.c index 25d24106f893..68a607ff9fd3 100644 --- a/fs/ntfs/compress.c +++ b/fs/ntfs/compress.c | |||
| @@ -67,7 +67,7 @@ static DEFINE_SPINLOCK(ntfs_cb_lock); | |||
| 67 | /** | 67 | /** |
| 68 | * allocate_compression_buffers - allocate the decompression buffers | 68 | * allocate_compression_buffers - allocate the decompression buffers |
| 69 | * | 69 | * |
| 70 | * Caller has to hold the ntfs_lock semaphore. | 70 | * Caller has to hold the ntfs_lock mutex. |
| 71 | * | 71 | * |
| 72 | * Return 0 on success or -ENOMEM if the allocations failed. | 72 | * Return 0 on success or -ENOMEM if the allocations failed. |
| 73 | */ | 73 | */ |
| @@ -84,7 +84,7 @@ int allocate_compression_buffers(void) | |||
| 84 | /** | 84 | /** |
| 85 | * free_compression_buffers - free the decompression buffers | 85 | * free_compression_buffers - free the decompression buffers |
| 86 | * | 86 | * |
| 87 | * Caller has to hold the ntfs_lock semaphore. | 87 | * Caller has to hold the ntfs_lock mutex. |
| 88 | */ | 88 | */ |
| 89 | void free_compression_buffers(void) | 89 | void free_compression_buffers(void) |
| 90 | { | 90 | { |