diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1997-06-17 13:20:30 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1997-06-17 13:20:30 +0000 |
| commit | 7acb77a6e7bddd4c4c5aa975bbf976927c013798 (patch) | |
| tree | 4139829ec6edb85f73774bb95cdec376758bfc73 /fs/fat | |
| parent | 64d58d4c8cd6a89ee218301ec0dc0ebfec91a4db (diff) | |
Merge with 2.1.43.
Diffstat (limited to 'fs/fat')
| -rw-r--r-- | fs/fat/dir.c | 5 | ||||
| -rw-r--r-- | fs/fat/file.c | 2 | ||||
| -rw-r--r-- | fs/fat/mmap.c | 2 |
3 files changed, 2 insertions, 7 deletions
diff --git a/fs/fat/dir.c b/fs/fat/dir.c index 45b31836b..c39661904 100644 --- a/fs/fat/dir.c +++ b/fs/fat/dir.c @@ -260,10 +260,8 @@ int fat_readdirx( ino = fat_parent_ino(inode,0); if (shortnames || !is_long) { - dcache_add(inode, bufname, i+dotoffset, ino); - if (both) { + if (both) bufname[i+dotoffset] = '\0'; - } spos = oldpos; if (is_long) { spos = filp->f_pos - sizeof(struct msdos_dir_entry); @@ -276,7 +274,6 @@ int fat_readdirx( } } if (is_long && longnames) { - dcache_add(inode, longname, long_len, ino); if (both) { memcpy(&longname[long_len+1], bufname, i+dotoffset); long_len += i+dotoffset; diff --git a/fs/fat/file.c b/fs/fat/file.c index 6dec1ba42..82787075a 100644 --- a/fs/fat/file.c +++ b/fs/fat/file.c @@ -52,7 +52,6 @@ struct inode_operations fat_file_inode_operations = { NULL, /* mknod */ NULL, /* rename */ NULL, /* readlink */ - NULL, /* follow_link */ generic_readpage, /* readpage */ NULL, /* writepage */ fat_bmap, /* bmap */ @@ -100,7 +99,6 @@ struct inode_operations fat_file_inode_operations_1024 = { NULL, /* mknod */ NULL, /* rename */ NULL, /* readlink */ - NULL, /* follow_link */ NULL, /* readpage */ NULL, /* writepage */ NULL, /* bmap */ diff --git a/fs/fat/mmap.c b/fs/fat/mmap.c index 7896a4cfe..6a3515eef 100644 --- a/fs/fat/mmap.c +++ b/fs/fat/mmap.c @@ -105,7 +105,7 @@ int fat_mmap(struct inode * inode, struct file * file, struct vm_area_struct * v } vma->vm_inode = inode; - inode->i_count++; + atomic_inc(&inode->i_count); vma->vm_ops = &fat_file_mmap; return 0; } |