diff options
| author | Alexander Viro <viro@math.psu.edu> | 2002-03-12 01:53:22 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@penguin.transmeta.com> | 2002-03-12 01:53:22 -0800 |
| commit | 8e9d64d9a360825a354c47d9629510601a7927c8 (patch) | |
| tree | 20edc63d920b0d0632fa45b48e2bb592de007d03 /include/linux | |
| parent | 594ece65280586acf160038f2426fe89564867f8 (diff) | |
[PATCH] (3/4) smarter nfs_get_sb()
Switch NFS to separate allocation of private part of superblock,
uss explicit sget() instead of get_sb_nodev()
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/fs.h | 2 | ||||
| -rw-r--r-- | include/linux/nfs_fs.h | 4 | ||||
| -rw-r--r-- | include/linux/nfs_fs_sb.h | 7 | ||||
| -rw-r--r-- | include/linux/nfs_page.h | 1 |
4 files changed, 4 insertions, 10 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index bc68e7ad5ad1..7611f4f3bde0 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -653,7 +653,6 @@ struct quota_mount_options #include <linux/ntfs_fs_sb.h> #include <linux/msdos_fs_sb.h> #include <linux/iso_fs_sb.h> -#include <linux/nfs_fs_sb.h> #include <linux/sysv_fs_sb.h> #include <linux/affs_fs_sb.h> #include <linux/ufs_fs_sb.h> @@ -707,7 +706,6 @@ struct super_block { struct ntfs_sb_info ntfs_sb; struct msdos_sb_info msdos_sb; struct isofs_sb_info isofs_sb; - struct nfs_sb_info nfs_sb; struct sysv_sb_info sysv_sb; struct affs_sb_info affs_sb; struct ufs_sb_info ufs_sb; diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h index 85a4666e8c4b..499b246788f4 100644 --- a/include/linux/nfs_fs.h +++ b/include/linux/nfs_fs.h @@ -14,6 +14,8 @@ #include <linux/mm.h> #include <linux/pagemap.h> +#include <linux/nfs_fs_sb.h> + #include <linux/sunrpc/debug.h> #include <linux/sunrpc/auth.h> #include <linux/sunrpc/clnt.h> @@ -174,7 +176,7 @@ static inline struct nfs_inode *NFS_I(struct inode *inode) { return list_entry(inode, struct nfs_inode, vfs_inode); } -#define NFS_SB(s) (&s->u.nfs_sb.s_server) +#define NFS_SB(s) ((struct nfs_server *)(s->u.generic_sbp)) #define NFS_FH(inode) (&NFS_I(inode)->fh) #define NFS_SERVER(inode) (NFS_SB(inode->i_sb)) diff --git a/include/linux/nfs_fs_sb.h b/include/linux/nfs_fs_sb.h index c5fc3aa01a7a..e52d807d67da 100644 --- a/include/linux/nfs_fs_sb.h +++ b/include/linux/nfs_fs_sb.h @@ -29,11 +29,4 @@ struct nfs_server { lru_busy; }; -/* - * nfs super-block data in memory - */ -struct nfs_sb_info { - struct nfs_server s_server; -}; - #endif diff --git a/include/linux/nfs_page.h b/include/linux/nfs_page.h index d339e29a607d..6bc44a6b1cb7 100644 --- a/include/linux/nfs_page.h +++ b/include/linux/nfs_page.h @@ -13,6 +13,7 @@ #include <linux/list.h> #include <linux/mm.h> #include <linux/wait.h> +#include <linux/nfs_fs_sb.h> #include <linux/sunrpc/auth.h> #include <linux/nfs_xdr.h> |