diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-07-05 23:09:37 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-07-05 23:09:37 +0000 |
| commit | aba344fdfed81b2c03d6114c54cfd73a486aa10b (patch) | |
| tree | d032d8430bf1234c3ecc6f6330d6de6e887e5963 /fs/smbfs | |
| parent | 40c138bfc6d37dbff5339f84575db1e3cec6e34e (diff) | |
Merge with Linux 2.3.9.
Diffstat (limited to 'fs/smbfs')
| -rw-r--r-- | fs/smbfs/dir.c | 3 | ||||
| -rw-r--r-- | fs/smbfs/file.c | 3 | ||||
| -rw-r--r-- | fs/smbfs/inode.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/fs/smbfs/dir.c b/fs/smbfs/dir.c index 870ebac74..cbaa646b3 100644 --- a/fs/smbfs/dir.c +++ b/fs/smbfs/dir.c @@ -59,9 +59,10 @@ struct inode_operations smb_dir_inode_operations = smb_rename, /* rename */ NULL, /* readlink */ NULL, /* follow_link */ + NULL, /* get_block */ NULL, /* readpage */ NULL, /* writepage */ - NULL, /* bmap */ + NULL, /* flushpage */ NULL, /* truncate */ NULL, /* permission */ NULL, /* smap */ diff --git a/fs/smbfs/file.c b/fs/smbfs/file.c index cfb2d82da..682b511f6 100644 --- a/fs/smbfs/file.c +++ b/fs/smbfs/file.c @@ -404,9 +404,10 @@ struct inode_operations smb_file_inode_operations = NULL, /* rename */ NULL, /* readlink */ NULL, /* follow_link */ + NULL, /* get_block */ smb_readpage, /* readpage */ smb_writepage, /* writepage */ - NULL, /* bmap */ + NULL, /* flushpage */ NULL, /* truncate */ smb_file_permission, /* permission */ NULL, /* smap */ diff --git a/fs/smbfs/inode.c b/fs/smbfs/inode.c index 627186cae..cf3539823 100644 --- a/fs/smbfs/inode.c +++ b/fs/smbfs/inode.c @@ -6,9 +6,7 @@ * */ -#include <linux/config.h> #include <linux/module.h> - #include <linux/sched.h> #include <linux/kernel.h> #include <linux/mm.h> |