diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-03-13 20:55:15 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-03-13 20:55:15 +0000 |
| commit | 1471f525455788c20b130690e0f104df451aeb43 (patch) | |
| tree | 3778beba56558beb9a9548ea5b467e9c44ea966f /arch/alpha | |
| parent | e80d2c5456d30ebba5b0eb8a9d33e17d815d4d83 (diff) | |
Merge with Linux 2.3.51.
Diffstat (limited to 'arch/alpha')
| -rw-r--r-- | arch/alpha/config.in | 2 | ||||
| -rw-r--r-- | arch/alpha/defconfig | 4 | ||||
| -rw-r--r-- | arch/alpha/kernel/osf_sys.c | 15 |
3 files changed, 4 insertions, 17 deletions
diff --git a/arch/alpha/config.in b/arch/alpha/config.in index 1686fefbc..6e760c917 100644 --- a/arch/alpha/config.in +++ b/arch/alpha/config.in @@ -270,7 +270,7 @@ source drivers/char/Config.in source drivers/usb/Config.in -source drivers/misc/Config.in +#source drivers/misc/Config.in source fs/Config.in diff --git a/arch/alpha/defconfig b/arch/alpha/defconfig index 9365dc4e2..cc244e560 100644 --- a/arch/alpha/defconfig +++ b/arch/alpha/defconfig @@ -324,10 +324,6 @@ CONFIG_PSMOUSE=y # CONFIG_USB is not set # -# Misc devices -# - -# # Filesystems # # CONFIG_QUOTA is not set diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c index 6a2ff8a9b..091edaf37 100644 --- a/arch/alpha/kernel/osf_sys.c +++ b/arch/alpha/kernel/osf_sys.c @@ -303,18 +303,9 @@ static int linux_to_osf_statfs(struct statfs *linux_stat, struct osf_statfs *osf static int do_osf_statfs(struct dentry * dentry, struct osf_statfs *buffer, unsigned long bufsiz) { struct statfs linux_stat; - struct inode * inode = dentry->d_inode; - struct super_block * sb = inode->i_sb; - int error; - - error = -ENODEV; - if (sb && sb->s_op && sb->s_op->statfs) { - set_fs(KERNEL_DS); - error = sb->s_op->statfs(sb, &linux_stat, sizeof(linux_stat)); - set_fs(USER_DS); - if (!error) - error = linux_to_osf_statfs(&linux_stat, buffer, bufsiz); - } + int error = vfs_statfs(dentry->d_inode->i_sb, &linux_stat); + if (!error) + error = linux_to_osf_statfs(&linux_stat, buffer, bufsiz); return error; } |