diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2000-11-23 02:00:47 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2000-11-23 02:00:47 +0000 |
commit | 06615f62b17d7de6e12d2f5ec6b88cf30af08413 (patch) | |
tree | 8766f208847d4876a6db619aebbf54d53b76eb44 /fs/coda | |
parent | fa9bdb574f4febb751848a685d9a9017e04e1d53 (diff) |
Merge with Linux 2.4.0-test10.
Diffstat (limited to 'fs/coda')
-rw-r--r-- | fs/coda/dir.c | 2 | ||||
-rw-r--r-- | fs/coda/inode.c | 2 | ||||
-rw-r--r-- | fs/coda/psdev.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/fs/coda/dir.c b/fs/coda/dir.c index 1629be782..e1ab9e896 100644 --- a/fs/coda/dir.c +++ b/fs/coda/dir.c @@ -58,7 +58,7 @@ static int coda_venus_readdir(struct file *filp, void *dirent, filldir_t filldir); int coda_fsync(struct file *, struct dentry *dentry, int datasync); -int coda_hasmknod = 0; +int coda_hasmknod; struct dentry_operations coda_dentry_operations = { diff --git a/fs/coda/inode.c b/fs/coda/inode.c index 94a3be389..45acf28c6 100644 --- a/fs/coda/inode.c +++ b/fs/coda/inode.c @@ -93,7 +93,7 @@ static int get_device_index(struct coda_mount_data *data) static struct super_block * coda_read_super(struct super_block *sb, void *data, int silent) { - struct inode *psdev = 0, *root = 0; + struct inode *root = 0; struct coda_sb_info *sbi = NULL; struct venus_comm *vc = NULL; ViceFid fid; diff --git a/fs/coda/psdev.c b/fs/coda/psdev.c index 486e42185..ef05ac2fb 100644 --- a/fs/coda/psdev.c +++ b/fs/coda/psdev.c @@ -54,7 +54,7 @@ extern struct file_system_type coda_fs_type; /* statistics */ -int coda_hard = 0; /* allows signals during upcalls */ +int coda_hard; /* allows signals during upcalls */ unsigned long coda_timeout = 30; /* .. secs, then signals will dequeue */ @@ -376,7 +376,7 @@ static struct file_operations coda_psdev_fops = { release: coda_psdev_release, }; -static devfs_handle_t devfs_handle = NULL; +static devfs_handle_t devfs_handle; static int init_coda_psdev(void) { |