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/hpfs | |
| parent | d087e4bdd24ebe3ae3d0b265b6573ec901af4b4b (diff) | |
| parent | 0f36b018b2e314d45af86449f1a97facb1fbe300 (diff) | |
Merge branch 'master' of /usr/src/ntfs-2.6/
Diffstat (limited to 'fs/hpfs')
| -rw-r--r-- | fs/hpfs/dir.c | 6 | 
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/hpfs/dir.c b/fs/hpfs/dir.c index 0217c3a04441..5591f9623aa2 100644 --- a/fs/hpfs/dir.c +++ b/fs/hpfs/dir.c  | |||
| @@ -32,19 +32,19 @@ static loff_t hpfs_dir_lseek(struct file *filp, loff_t off, int whence) | |||
| 32 | 32 | ||
| 33 | /*printk("dir lseek\n");*/ | 33 | /*printk("dir lseek\n");*/ | 
| 34 | if (new_off == 0 || new_off == 1 || new_off == 11 || new_off == 12 || new_off == 13) goto ok; | 34 | if (new_off == 0 || new_off == 1 || new_off == 11 || new_off == 12 || new_off == 13) goto ok; | 
| 35 | down(&i->i_sem); | 35 | mutex_lock(&i->i_mutex); | 
| 36 | pos = ((loff_t) hpfs_de_as_down_as_possible(s, hpfs_inode->i_dno) << 4) + 1; | 36 | pos = ((loff_t) hpfs_de_as_down_as_possible(s, hpfs_inode->i_dno) << 4) + 1; | 
| 37 | while (pos != new_off) { | 37 | while (pos != new_off) { | 
| 38 | if (map_pos_dirent(i, &pos, &qbh)) hpfs_brelse4(&qbh); | 38 | if (map_pos_dirent(i, &pos, &qbh)) hpfs_brelse4(&qbh); | 
| 39 | else goto fail; | 39 | else goto fail; | 
| 40 | if (pos == 12) goto fail; | 40 | if (pos == 12) goto fail; | 
| 41 | } | 41 | } | 
| 42 | up(&i->i_sem); | 42 | mutex_unlock(&i->i_mutex); | 
| 43 | ok: | 43 | ok: | 
| 44 | unlock_kernel(); | 44 | unlock_kernel(); | 
| 45 | return filp->f_pos = new_off; | 45 | return filp->f_pos = new_off; | 
| 46 | fail: | 46 | fail: | 
| 47 | up(&i->i_sem); | 47 | mutex_unlock(&i->i_mutex); | 
| 48 | /*printk("illegal lseek: %016llx\n", new_off);*/ | 48 | /*printk("illegal lseek: %016llx\n", new_off);*/ | 
| 49 | unlock_kernel(); | 49 | unlock_kernel(); | 
| 50 | return -ESPIPE; | 50 | return -ESPIPE; | 
