diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2006-01-19 11:39:33 -0500 | 
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2006-01-19 11:39:33 -0500 | 
| commit | 944d79559d154c12becde0dab327016cf438f46c (patch) | |
| tree | 50c101806f4d3b6585222dda060559eb4f3e005a /fs/block_dev.c | |
| parent | d087e4bdd24ebe3ae3d0b265b6573ec901af4b4b (diff) | |
| parent | 0f36b018b2e314d45af86449f1a97facb1fbe300 (diff) | |
Merge branch 'master' of /usr/src/ntfs-2.6/
Diffstat (limited to 'fs/block_dev.c')
| -rw-r--r-- | fs/block_dev.c | 4 | 
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/block_dev.c b/fs/block_dev.c index e0df94c37b7e..6e50346fb1ee 100644 --- a/fs/block_dev.c +++ b/fs/block_dev.c  | |||
| @@ -202,7 +202,7 @@ static loff_t block_llseek(struct file *file, loff_t offset, int origin) | |||
| 202 | loff_t size; | 202 | loff_t size; | 
| 203 | loff_t retval; | 203 | loff_t retval; | 
| 204 | 204 | ||
| 205 | down(&bd_inode->i_sem); | 205 | mutex_lock(&bd_inode->i_mutex); | 
| 206 | size = i_size_read(bd_inode); | 206 | size = i_size_read(bd_inode); | 
| 207 | 207 | ||
| 208 | switch (origin) { | 208 | switch (origin) { | 
| @@ -219,7 +219,7 @@ static loff_t block_llseek(struct file *file, loff_t offset, int origin) | |||
| 219 | } | 219 | } | 
| 220 | retval = offset; | 220 | retval = offset; | 
| 221 | } | 221 | } | 
| 222 | up(&bd_inode->i_sem); | 222 | mutex_unlock(&bd_inode->i_mutex); | 
| 223 | return retval; | 223 | return retval; | 
| 224 | } | 224 | } | 
| 225 | 225 | ||
