Permit filesystem local caching and NFS superblock sharing [try #11]
Subsystems (14)
David Howells
maintainercover Permit filesystem local caching and NFS superblock sharing [try #11]
These patches make it possible to share NFS superblocks between related mounts, where "related" means on the same server and FSID. Inodes and dentries will be shared where the NFS filehandles are the same (for example if two NFS3 files come from the same export but from different mounts, such as is not uncommon with autofs on /home).
These patches also add local caching for network filesystems such as NFS and AFS.
The patches can be grouped as:
(A) 01-21
NFS Superblock unification. Patches 01-19 are in Trond's NFS GIT tree.
(B) 22-25
Filesystem caching, including support for AFS.
(C) 26
Filesystem caching support for NFS; depends on (A) and (B).
(D) 27-28
CacheFiles: cache on files backend; depends on (B).
(E) 29-30
dentry cleanup during unmount optimisation. Patch 29 cleans up autofs4, patch 30 will make autofs4 oops during unmount if patch 29 isn't applied.
---
Changes [try #9] that have been made:
(*) [PATCH] NFS: Permit filesystem to perform statfs with a known root dentry
[*] Inclusions of linux/mount.h have been added where necessary to make
allyesconfig build successfully.
(*) [PATCH] NFS: Share NFS superblocks per-protocol per-server per-FSID
[*] The exports from fs/namespace.c and fs/namei.c are no longer required.
(*) [PATCH] FS-Cache: Release page->private in failed readahead
[*] The try_to_release_page() is called instead of calling the
releasepage() op directly.
[*] The page is locked before try_to_release_page() is called.
[*] The call to try_to_release_page() and page_cache_release() have been
abstracted out into a helper function as this bit of code occurs twice..
Changes [try #10] that have been made:
(*) [PATCH] NFS: Permit filesystem to perform statfs with a known root dentry
[*] Pass a dentry rather than a vfsmount to the statfs() op as the key by
which to determine the filesystem.
(*) [PATCH] NFS: Share NFS superblocks per-protocol per-server per-FSID
[*] nfs4_pathname_string() needed an extra const.
(*) [PATCH] FS-Cache: Release page->private in failed readahead
[*] The comment header on the helper function is much expanded. This
states why there's a need to call the releasepage() op in the event of an error.
[*] BUG() if the page is already locked when we try and lock it.
[*] Don't set the page mapping pointer until we've locked the page.
[*] The page is unlocked after try_to_release_page() is called.
(*) The release-page patch now comes before the fscache-afs patch as well as
the fscache-nfs patch.
Changes [try #11] that have been made:
(*) Split up of the NFS superblock sharing patches into a set of smaller
patches and reworked some of the contents as per Trond's suggestions.
(*) [PATCH] NFS: Fix error handling
[*] Fix error handling in earlier patches (the earlier patches are also in
Trond's NFS tree, so I haven't rolled this in for the moment).
(*) [PATCH] NFS: Secure the roots of the NFS subtrees in a shared superblock
[*] Initialise the security on detached NFS roots manually since they're
allocated with dcache_alloc_anon() not dcache_alloc_root().
(*) [PATCH] FS-Cache: CacheFiles: A cache that backs onto a mounted filesystem
[*] Don't use file structs when accessing the data storage backing files.
Pass NULL as the file argument to prepare_write() and commit_write() calls.
[*] Check for a bmap() inode op to prevent NFS being used as the cache
backing store (and besides, we need bmap() available anyway).
(*) [PATCH] FS-Cache: CacheFiles: ia64: missing copy_page export
[*] Export copy_page() on IA-64 as we need that.
(*) [PATCH] AUTOFS: Make sure all dentries refs are released before calling kill_anon_super()
[*] Make sure autofs4 releases all its retained dentries in its kill_sb()
op before calling kill_anon_super() rather than in the put_super() op. This prevents the next patch from oopsing it.
(*) [PATCH] VFS: Destroy the dentries contributed by a superblock on unmounting
[*] Optimise the destruction of the dentries attached to a superblock
during unmounting.
---
In response to those who've asked, there are at least three reasons for implementing superblock sharing:
(1) As I understand what I've been told, NFSv4 requires a 1:1 mapping between server files and client files. I suspect this has to do with the management of leases.
(2) We can reduce the resource consumption on NFSv2 and NFSv3 clients as well as on NFSv4 clients by sharing superblocks that cover overlapping segments of the file space.
Consider a machine that's used by a lot of people at the same time, each of whom has an automounted NFS homedir off of the same server - and in fact off of the same disk on the that server. Currently, with Linus's tree, each one will get a separate superblock to represent them; with Trond's tree, each one will still get a separate superblock unless they share the same root filehandle; and with my patches, they'll get the same superblock.
If two homedirs have a hard link between them (unlikely, I know, but by no means impossible, and probably more likely with, say, data such as NFS mounted git repositories), then you have the possibility of aliasing. This means that you can have two or more inodes in core that refer to the same server object, and each of these inodes can have pages that refer to the same remote pages on the server - aliasing again. You _have_ to have two inodes because they're covered by separate superblocks.
Aliasing is bad, generally, because you end up using more storage than you need to (pagecache and inode cache in this case), and you have the problem of keeping them in sync. It's also twice as hard to keep two inodes up to date when they change on the server as to keep one up to date.
If you can use the same superblock where possible, then you can cut out aliasing on that client since you can share dentries that have the same file handle (hard links or subtrees).
Part of the problem with NFSv2 and NFSv3 is that you invoke mountd to get the filehandle to a subtree, but you may not be able to work out how two different subtrees relate. The getsb patch permits the superblock to have more than one root, which allows us to defer this problem until we see the root of one subtree cropping up in another subtree - at which point we can splice the former into the latter.
(3) In my local file caching patches (FS-Cache), I have two reasons for wanting this:
(a) Unique keys. I need a unique key to find an object in the cache. If we can get inode aliases, then I end up with several inodes referring to the same cache object. This also means that I have to use a fair bit of extra memory to keep track of the multiple cookie mappings in FS-Cache, and have to compare keys a lot to find duplicate mappings.
If I can assume that the _netfs_ will manage the 1:1 mapping, I can use a lot less memory and save some processing capacity also.
I don't want to invent random keys to differentiate aliased superblocks or inodes as that destroys the persistence capabilities of the cache across power failures and reboots.
(b) Callbacks. I want a callback that the netfs passes to FS-Cache to permit the cache to update the metadata in the cache from netfs metadata at convenient times. However, if there's more than one inode alias in core, which one should the cache use?
AFS doesn't have anything like these problems because mounts are always made from the root of a volume, and AFS was designed with local caching in mind.
The getsb and statfs patches are a consequence of NFS being permitted to mount arbitrary subtrees from the server.
David
David Howells
maintainerPATCH 1/30 NFS: Add dentry materialisation op [try #11]
The attached patch adds a new directory cache management function that prepares a disconnected anonymous function to be connected into the dentry tree. The anonymous dentry is transferred the name and parentage from another dentry.
The following changes were made in [try #2]:
(*) d_materialise_dentry() now switches the parentage of the two nodes around
correctly when one or other of them is self-referential.
The following changes were made in [try #7]:
(*) d_instantiate_unique() has had the interior part split out as function
__d_instantiate_unique(). Callers of this latter function must be holding the appropriate locks.
(*) _d_rehash() has been added as a wrapper around __d_rehash() to call it
with the most obvious hash list (the one from the name). d_rehash() now calls _d_rehash().
(*) d_materialise_dentry() is now __d_materialise_dentry() and is static.
(*) d_materialise_unique() added to perform the combination of d_find_alias(),
d_materialise_dentry() and d_add_unique() that the NFS client was doing twice, all within a single dcache_lock critical section. This reduces the number of times two different spinlocks were being accessed.
The following further changes were made:
(*) Add the dentries onto their parents d_subdirs lists.
---
fs/dcache.c | 164 ++++++++++++++++++++++++++++++++++++++++++++---- include/linux/dcache.h | 1 2 files changed, 151 insertions(+), 14 deletions(-)
fs/dcache.c +150 -14
@@ -828,17 +828,19 @@ void d_instantiate(struct dentry *entry,* (or otherwise set) by the caller to indicate that it is now * in use by the dcache. */ -struct dentry *d_instantiate_unique (struct dentry *entry,struct inode *inode) +static struct dentry *__d_instantiate_unique (struct dentry *entry, +struct inode *inode) {struct dentry *alias;int len = entry->d_name.len;const char *name = entry->d_name.name;unsigned int hash = entry->d_name.hash; -BUG_ON (!list_empty (&entry->d_alias)); -spin_lock (&dcache_lock); -if (!inode) - goto do_negative; +if (!inode) { + entry->d_inode =NULL ; +return NULL ; + } +list_for_each_entry (alias, &inode->i_dentry, d_alias) {struct qstr *qstr = &alias->d_name;
@@ -851,19 +853,35 @@ struct dentry *d_instantiate_unique(struif (memcmp (qstr->name, name, len))continue ;dget_locked (alias); -spin_unlock (&dcache_lock); -BUG_ON (!d_unhashed (alias)); -iput (inode);return alias; } +list_add (&entry->d_alias, &inode->i_dentry); -do_negative: entry->d_inode = inode;fsnotify_d_instantiate (entry, inode); -spin_unlock (&dcache_lock); -security_d_instantiate (entry, inode);return NULL ; } + +struct dentry *d_instantiate_unique (struct dentry *entry,struct inode *inode) +{ +struct dentry *result; + +BUG_ON (!list_empty (&entry->d_alias)); + +spin_lock (&dcache_lock); + result =__d_instantiate_unique (entry, inode); +spin_unlock (&dcache_lock); + +if (!result) { +security_d_instantiate (entry, inode); +return NULL ; + } + +BUG_ON (!d_unhashed (result)); +iput (inode); +return result; +} +EXPORT_SYMBOL (d_instantiate_unique);/**
@@ -1235,6 +1253,11 @@ static void __d_rehash(struct dentry * ehlist_add_head_rcu (&entry->d_hash, list); } +static void _d_rehash (struct dentry * entry) +{ +__d_rehash (entry,d_hash (entry->d_parent, entry->d_name.hash)); +} +/** * d_rehash - add an entry back to the hash * @entry: dentry to add to the hash
@@ -1244,11 +1267,9 @@ static void __d_rehash(struct dentry * evoid d_rehash (struct dentry * entry) { -struct hlist_head *list =d_hash (entry->d_parent, entry->d_name.hash); -spin_lock (&dcache_lock);spin_lock (&entry->d_lock); -__d_rehash (entry, list); +_d_rehash (entry);spin_unlock (&entry->d_lock);spin_unlock (&dcache_lock); }
@@ -1386,6 +1407,120 @@ already_unhashed:spin_unlock (&dcache_lock); } +/* +* Prepare an anonymous dentry for life in the superblock's dentry tree as a +* named dentry in place of the dentry to be replaced. +*/ +static void __d_materialise_dentry (struct dentry *dentry,struct dentry *anon) +{ +struct dentry *dparent, *aparent; + +switch_names (dentry, anon); +do_switch (dentry->d_name.len, anon->d_name.len); +do_switch (dentry->d_name.hash, anon->d_name.hash); + + dparent = dentry->d_parent; + aparent = anon->d_parent; + + dentry->d_parent = (aparent == anon) ? dentry : aparent; +list_del (&dentry->d_u.d_child); +if (!IS_ROOT (dentry)) +list_add (&dentry->d_u.d_child, &dentry->d_parent->d_subdirs); +else +INIT_LIST_HEAD (&dentry->d_u.d_child); + + anon->d_parent = (dparent == dentry) ? anon : dparent; +list_del (&anon->d_u.d_child); +if (!IS_ROOT (anon)) +list_add (&anon->d_u.d_child, &anon->d_parent->d_subdirs); +else +INIT_LIST_HEAD (&anon->d_u.d_child); + + anon->d_flags &= ~DCACHE_DISCONNECTED ; +} + +/** +* d_materialise_unique - introduce an inode into the tree +* @dentry: candidate dentry +* @inode: inode to bind to the dentry, to which aliases may be attached +* +* Introduces an dentry into the tree, substituting an extant disconnected +* root directory alias in its place if there is one +*/ +struct dentry *d_materialise_unique (struct dentry *dentry,struct inode *inode) +{ +struct dentry *alias, *actual; + +BUG_ON (!d_unhashed (dentry)); + +spin_lock (&dcache_lock); + +if (!inode) { + actual = dentry; + dentry->d_inode =NULL ; + goto found_lock; + } + +/* See if a disconnected directory already exists as an anonymous root +* that we should splice into the tree instead */ +if (S_ISDIR (inode->i_mode) && (alias =__d_find_alias (inode,1 ))) { +spin_lock (&alias->d_lock); + +/* Is this a mountpoint that we could splice into our tree? */ +if (IS_ROOT (alias)) + goto connect_mountpoint; + +if (alias->d_name.len == dentry->d_name.len && + alias->d_parent == dentry->d_parent && +memcmp (alias->d_name.name, + dentry->d_name.name, + dentry->d_name.len) ==0 ) + goto replace_with_alias; + +spin_unlock (&alias->d_lock); + +/* Doh! Seem to be aliasing directories for some reason... */ +dput (alias); + } + +/* Add a unique reference */ + actual =__d_instantiate_unique (dentry, inode); +if (!actual) + actual = dentry; +else if (unlikely (!d_unhashed (actual))) + goto shouldnt_be_hashed; + +found_lock: +spin_lock (&actual->d_lock); +found: +_d_rehash (actual); +spin_unlock (&actual->d_lock); +spin_unlock (&dcache_lock); + +if (actual == dentry) { +security_d_instantiate (dentry, inode); +return NULL ; + } + +iput (inode); +return actual; + +/* Convert the anonymous/root alias into an ordinary dentry */ +connect_mountpoint: +__d_materialise_dentry (dentry, alias); + +/* Replace the candidate dentry with the alias in the tree */ +replace_with_alias: +__d_drop (alias); + actual = alias; + goto found; + +shouldnt_be_hashed: +spin_unlock (&dcache_lock); +BUG (); + goto shouldnt_be_hashed; +} +/** * d_path - return the path of a dentry * @dentry: dentry to report
@@ -1784,6 +1919,7 @@ EXPORT_SYMBOL(d_instantiate);EXPORT_SYMBOL (d_invalidate);EXPORT_SYMBOL (d_lookup);EXPORT_SYMBOL (d_move); +EXPORT_SYMBOL_GPL (d_materialise_unique);EXPORT_SYMBOL (d_path);EXPORT_SYMBOL (d_prune_aliases);EXPORT_SYMBOL (d_rehash);
include/linux/dcache.h +1 -0
@@ -221,6 +221,7 @@ static inline int dname_external(struct*/ extern void d_instantiate (struct dentry *,struct inode *);extern struct dentry *d_instantiate_unique (struct dentry *,struct inode *); +extern struct dentry *d_materialise_unique (struct dentry *,struct inode *);extern void d_delete (struct dentry *);/* allocate/de-allocate */
David Howells
maintainerPATCH 2/30 NFS: Fix up split of fs/nfs/inode.c [try #11]
In reply to David HowellsFix ups for the splitting of the superblock stuff out of fs/nfs/inode.c, including:
(*) Move the callback tcpport module param into callback.c.
(*) Move the idmap cache timeout module param into idmap.c.
(*) Changes to internal.h:
(*) namespace-nfs4.c was renamed to nfs4namespace.c.
(*) nfs_stat_to_errno() is in nfs2xdr.c, not nfs4xdr.c.
(*) nfs4xdr.c is contingent on CONFIG_NFS_V4.
(*) nfs4_path() is only uses if CONFIG_NFS_V4 is set.
Plus also:
(*) The sec_flavours[] table should really be const.
---
fs/nfs/callback.c | 15 +++++++++++++++ fs/nfs/idmap.c | 14 ++++++++++++++ fs/nfs/internal.h | 12 ++++++------ fs/nfs/super.c | 40 ++++------------------------------------ 4 files changed, 39 insertions(+), 42 deletions(-)
fs/nfs/callback.c +15 -0
@@ -36,6 +36,21 @@ static struct svc_program nfs4_callback_unsigned int nfs_callback_set_tcpport;unsigned short nfs_callback_tcpport; +static const int nfs_set_port_min =0 ; +static const int nfs_set_port_max =65535 ; + +static int param_set_port (const char *val,struct kernel_param *kp) +{ +char *endp; +int num =simple_strtol (val, &endp,0 ); +if (endp == val || *endp || num < nfs_set_port_min || num > nfs_set_port_max) +return -EINVAL ; + *((int *)kp->arg) = num; +return 0 ; +} + +module_param_call (callback_tcpport, param_set_port, param_get_int, + &nfs_callback_set_tcpport,0644 );/* * This is the callback kernel thread.
fs/nfs/idmap.c +14 -0
@@ -57,6 +57,20 @@ #define IDMAP_HASH_SZ 128/* Default cache timeout is 10 minutes */ unsigned int nfs_idmap_cache_timeout =600 *HZ ; +static int param_set_idmap_timeout (const char *val,struct kernel_param *kp) +{ +char *endp; +int num =simple_strtol (val, &endp,0 ); +int jif = num *HZ ; +if (endp == val || *endp || num <0 || jif < num) +return -EINVAL ; + *((int *)kp->arg) = jif; +return 0 ; +} + +module_param_call (idmap_cache_timeout, param_set_idmap_timeout, param_get_int, + &nfs_idmap_cache_timeout,0644 ); +struct idmap_hashent {unsigned long ih_expires;__u32 ih_id;
fs/nfs/internal.h +6 -6
@@ -15,7 +15,7 @@ struct nfs_clone_mount {rpc_authflavor_t authflavor; }; -/* namespace-nfs4.c */ +/* nfs4namespace.c */ #ifdef CONFIG_NFS_V4 extern struct vfsmount *nfs_do_refmount (const struct vfsmount *mnt_parent,struct dentry *dentry);#else
@@ -46,6 +46,7 @@ #define nfs_destroy_directcache() do {}#endif /* nfs2xdr.c */ +extern int nfs_stat_to_errno (int );extern struct rpc_procinfo nfs_procedures[];extern u32 *nfs_decode_dirent (u32 *,struct nfs_entry *,int );
@@ -54,8 +55,9 @@ extern struct rpc_procinfo nfs3_procedurextern u32 *nfs3_decode_dirent (u32 *,struct nfs_entry *,int );/* nfs4xdr.c */ -extern int nfs_stat_to_errno (int ); +#ifdef CONFIG_NFS_V4 extern u32 *nfs4_decode_dirent (u32 *p,struct nfs_entry *entry,int plus); +#endif /* nfs4proc.c */ #ifdef CONFIG_NFS_V4
@@ -94,15 +96,13 @@ extern char *nfs_path(const char *base,/* * Determine the mount path as a string */ +#ifdef CONFIG_NFS_V4 static inline char *nfs4_path (const struct dentry *dentry,char *buffer,ssize_t buflen) { -#ifdef CONFIG_NFS_V4 return nfs_path (NFS_SB (dentry->d_sb)->mnt_path, dentry, buffer, buflen); -#else -return NULL ; -#endif } +#endif /* * Determine the device name as a string
fs/nfs/super.c +4 -36
@@ -187,40 +187,6 @@ static struct super_operations nfs4_sops };#endif -#ifdef CONFIG_NFS_V4 -static const int nfs_set_port_min =0 ; -static const int nfs_set_port_max =65535 ; - -static int param_set_port (const char *val,struct kernel_param *kp) -{ -char *endp; -int num =simple_strtol (val, &endp,0 ); -if (endp == val || *endp || num < nfs_set_port_min || num > nfs_set_port_max) -return -EINVAL ; - *((int *)kp->arg) = num; -return 0 ; -} - -module_param_call (callback_tcpport, param_set_port, param_get_int, - &nfs_callback_set_tcpport,0644 ); -#endif - -#ifdef CONFIG_NFS_V4 -static int param_set_idmap_timeout (const char *val,struct kernel_param *kp) -{ -char *endp; -int num =simple_strtol (val, &endp,0 ); -int jif = num *HZ ; -if (endp == val || *endp || num <0 || jif < num) -return -EINVAL ; - *((int *)kp->arg) = jif; -return 0 ; -} - -module_param_call (idmap_cache_timeout, param_set_idmap_timeout, param_get_int, - &nfs_idmap_cache_timeout,0644 ); -#endif -/* * Register the NFS filesystems */
@@ -323,9 +289,12 @@ static int nfs_statfs(struct dentry *den } +/* +* Map the security flavour number to a name +*/ static const char *nfs_pseudoflavour_to_name (rpc_authflavor_t flavour) { -static struct { +static const struct {rpc_authflavor_t flavour;const char *str; } sec_flavours[] = {
@@ -1363,7 +1332,6 @@ static int nfs4_get_sb(struct file_syste } s =sget (fs_type, nfs4_compare_super, nfs_set_super, server); -if (IS_ERR (s)) { error =PTR_ERR (s); goto out_free;
David Howells
maintainerPATCH 3/30 NFS: Disambiguate nfs_stat_to_errno() [try #11]
In reply to David HowellsRename the NFS4 version of nfs_stat_to_errno() so that it doesn't conflict with the common one used by NFS2 and NFS3.
---
fs/nfs/nfs4xdr.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-)
fs/nfs/nfs4xdr.c +7 -7
@@ -58,7 +58,7 @@ #define NFSDBG_FACILITY NFSDBG_XDR/* Mapping from NFS error code to "errno" error code. */ #define errno_NFSERR_IO EIO -static int nfs_stat_to_errno (int ); +static int nfs4_stat_to_errno (int );/* NFSv4 COMPOUND tags are only wanted for debugging purposes */ #ifdef DEBUG
@@ -2127,7 +2127,7 @@ static int decode_op_hdr(struct xdr_stre }READ32 (nfserr);if (nfserr !=NFS_OK ) -return -nfs_stat_to_errno (nfserr); +return -nfs4_stat_to_errno (nfserr);return 0 ; }
@@ -3597,7 +3597,7 @@ static int decode_setclientid(struct xdrREAD_BUF (len);return -NFSERR_CLID_INUSE ; }else -return -nfs_stat_to_errno (nfserr); +return -nfs4_stat_to_errno (nfserr);return 0 ; }
@@ -4255,7 +4255,7 @@ static int nfs4_xdr_dec_fsinfo(struct rpif (!status) status =decode_fsinfo (&xdr, fsinfo);if (!status) - status = -nfs_stat_to_errno (hdr.status); + status = -nfs4_stat_to_errno (hdr.status);return status; }
@@ -4345,7 +4345,7 @@ static int nfs4_xdr_dec_setclientid(struif (!status) status =decode_setclientid (&xdr, clp);if (!status) - status = -nfs_stat_to_errno (hdr.status); + status = -nfs4_stat_to_errno (hdr.status);return status; }
@@ -4367,7 +4367,7 @@ static int nfs4_xdr_dec_setclientid_confif (!status) status =decode_fsinfo (&xdr, fsinfo);if (!status) - status = -nfs_stat_to_errno (hdr.status); + status = -nfs4_stat_to_errno (hdr.status);return status; }
@@ -4520,7 +4520,7 @@ static struct {* This one is used jointly by NFSv2 and NFSv3. */ static int -nfs_stat_to_errno (int stat) +nfs4_stat_to_errno (int stat) {int i;for (i =0 ; nfs_errtbl[i].stat !=-1 ; i++) {
David Howells
maintainerPATCH 4/30 NFS: Fix NFS4 callback up/down prototypes [try #11]
In reply to David HowellsMake the nfs_callback_up()/down() prototypes just do nothing if NFS4 is not enabled. Also make the down function void type since we can't really do anything if it fails.
---
fs/nfs/callback.c | 5 +---- fs/nfs/callback.h | 7 ++++++- 2 files changed, 7 insertions(+), 5 deletions(-)
fs/nfs/callback.c +1 -4
@@ -149,10 +149,8 @@ out_err:/* * Kill the server process if it is not already up. */ -int nfs_callback_down (void ) +void nfs_callback_down (void ) { -int ret =0 ; -lock_kernel ();mutex_lock (&nfs_callback_mutex); nfs_callback_info.users--;
@@ -164,7 +162,6 @@ int nfs_callback_down(void) }while (wait_for_completion_timeout (&nfs_callback_info.stopped,5 *HZ ) ==0 );mutex_unlock (&nfs_callback_mutex);unlock_kernel (); -return ret; }static int nfs_callback_authenticate (struct svc_rqst *rqstp)
fs/nfs/callback.h +6 -1
@@ -62,8 +62,13 @@ struct cb_recallargs {extern unsigned nfs4_callback_getattr (struct cb_getattrargs *args,struct cb_getattrres *res);extern unsigned nfs4_callback_recall (struct cb_recallargs *args,void *dummy); +#ifdef CONFIG_NFS_V4 extern int nfs_callback_up (void ); -extern int nfs_callback_down (void ); +extern void nfs_callback_down (void ); +#else +#define nfs_callback_up () (0) +#define nfs_callback_down () do {} while(0) +#endif extern unsigned int nfs_callback_set_tcpport;extern unsigned short nfs_callback_tcpport;
David Howells
maintainerPATCH 5/30 NFS: Rename struct nfs4_client to struct nfs_client [try #11]
In reply to David HowellsRename struct nfs4_client to struct nfs_client so that it can become the basis for a general client record for NFS2 and NFS3 in addition to NFS4.
---
fs/nfs/callback.c | 2 +- fs/nfs/callback_proc.c | 4 ++-- fs/nfs/delegation.c | 24 +++++++++++----------- fs/nfs/delegation.h | 10 +++++---- fs/nfs/idmap.c | 12 +++++------ fs/nfs/nfs4_fs.h | 30 ++++++++++++++------------- fs/nfs/nfs4proc.c | 32 ++++++++++++++--------------- fs/nfs/nfs4renewd.c | 8 ++++--- fs/nfs/nfs4state.c | 50 +++++++++++++++++++++++---------------------- fs/nfs/nfs4xdr.c | 18 ++++++++-------- fs/nfs/super.c | 4 ++-- include/linux/nfs_fs_sb.h | 2 +- include/linux/nfs_idmap.h | 14 ++++++------- 13 files changed, 105 insertions(+), 105 deletions(-)
fs/nfs/callback.c +1 -1
@@ -167,7 +167,7 @@ void nfs_callback_down(void)static int nfs_callback_authenticate (struct svc_rqst *rqstp) {struct in_addr *addr = &rqstp->rq_addr.sin_addr; -struct nfs4_client *clp; +struct nfs_client *clp;/* Don't talk to strangers */ clp =nfs4_find_client (addr);
fs/nfs/callback_proc.c +2 -2
@@ -15,7 +15,7 @@ #define NFSDBG_FACILITY NFSDBG_CALLBACKunsigned nfs4_callback_getattr (struct cb_getattrargs *args,struct cb_getattrres *res) { -struct nfs4_client *clp; +struct nfs_client *clp;struct nfs_delegation *delegation;struct nfs_inode *nfsi;struct inode *inode;
@@ -56,7 +56,7 @@ out:unsigned nfs4_callback_recall (struct cb_recallargs *args,void *dummy) { -struct nfs4_client *clp; +struct nfs_client *clp;struct inode *inode;unsigned res;
fs/nfs/delegation.c +12 -12
@@ -114,7 +114,7 @@ void nfs_inode_reclaim_delegation(struct*/ int nfs_inode_set_delegation (struct inode *inode,struct rpc_cred *cred,struct nfs_openres *res) { -struct nfs4_client *clp =NFS_SERVER (inode)->nfs4_state; +struct nfs_client *clp =NFS_SERVER (inode)->nfs4_state;struct nfs_inode *nfsi =NFS_I (inode);struct nfs_delegation *delegation;int status =0 ;
@@ -176,7 +176,7 @@ static void nfs_msync_inode(struct inode*/ int __nfs_inode_return_delegation (struct inode *inode) { -struct nfs4_client *clp =NFS_SERVER (inode)->nfs4_state; +struct nfs_client *clp =NFS_SERVER (inode)->nfs4_state;struct nfs_inode *nfsi =NFS_I (inode);struct nfs_delegation *delegation;int res =0 ;
@@ -208,7 +208,7 @@ int __nfs_inode_return_delegation(struct*/ void nfs_return_all_delegations (struct super_block *sb) { -struct nfs4_client *clp =NFS_SB (sb)->nfs4_state; +struct nfs_client *clp =NFS_SB (sb)->nfs4_state;struct nfs_delegation *delegation;struct inode *inode;
@@ -232,7 +232,7 @@ restart:int nfs_do_expire_all_delegations (void *ptr) { -struct nfs4_client *clp = ptr; +struct nfs_client *clp = ptr;struct nfs_delegation *delegation;struct inode *inode;
@@ -258,7 +258,7 @@ out:module_put_and_exit (0 ); } -void nfs_expire_all_delegations (struct nfs4_client *clp) +void nfs_expire_all_delegations (struct nfs_client *clp) {struct task_struct *task;
@@ -276,7 +276,7 @@ void nfs_expire_all_delegations(struct n/* * Return all delegations following an NFS4ERR_CB_PATH_DOWN error. */ -void nfs_handle_cb_pathdown (struct nfs4_client *clp) +void nfs_handle_cb_pathdown (struct nfs_client *clp) {struct nfs_delegation *delegation;struct inode *inode;
@@ -299,7 +299,7 @@ restart:struct recall_threadargs {struct inode *inode; -struct nfs4_client *clp; +struct nfs_client *clp;const nfs4_stateid *stateid;struct completion started;
@@ -310,7 +310,7 @@ static int recall_thread(void *data) {struct recall_threadargs *args = (struct recall_threadargs *)data;struct inode *inode =igrab (args->inode); -struct nfs4_client *clp =NFS_SERVER (inode)->nfs4_state; +struct nfs_client *clp =NFS_SERVER (inode)->nfs4_state;struct nfs_inode *nfsi =NFS_I (inode);struct nfs_delegation *delegation;
@@ -371,7 +371,7 @@ out_module_put:/* * Retrieve the inode associated with a delegation */ -struct inode *nfs_delegation_find_inode (struct nfs4_client *clp,const struct nfs_fh *fhandle) +struct inode *nfs_delegation_find_inode (struct nfs_client *clp,const struct nfs_fh *fhandle) {struct nfs_delegation *delegation;struct inode *res =NULL ;
@@ -389,7 +389,7 @@ struct inode *nfs_delegation_find_inode(/* * Mark all delegations as needing to be reclaimed */ -void nfs_delegation_mark_reclaim (struct nfs4_client *clp) +void nfs_delegation_mark_reclaim (struct nfs_client *clp) {struct nfs_delegation *delegation;spin_lock (&clp->cl_lock);
@@ -401,7 +401,7 @@ void nfs_delegation_mark_reclaim(struct/* * Reap all unclaimed delegations after reboot recovery is done */ -void nfs_delegation_reap_unclaimed (struct nfs4_client *clp) +void nfs_delegation_reap_unclaimed (struct nfs_client *clp) {struct nfs_delegation *delegation, *n;LIST_HEAD (head);
@@ -423,7 +423,7 @@ void nfs_delegation_reap_unclaimed(strucint nfs4_copy_delegation_stateid (nfs4_stateid *dst,struct inode *inode) { -struct nfs4_client *clp =NFS_SERVER (inode)->nfs4_state; +struct nfs_client *clp =NFS_SERVER (inode)->nfs4_state;struct nfs_inode *nfsi =NFS_I (inode);struct nfs_delegation *delegation;int res =0 ;
fs/nfs/delegation.h +5 -5
@@ -29,13 +29,13 @@ void nfs_inode_reclaim_delegation(structint __nfs_inode_return_delegation (struct inode *inode);int nfs_async_inode_return_delegation (struct inode *inode,const nfs4_stateid *stateid); -struct inode *nfs_delegation_find_inode (struct nfs4_client *clp,const struct nfs_fh *fhandle); +struct inode *nfs_delegation_find_inode (struct nfs_client *clp,const struct nfs_fh *fhandle);void nfs_return_all_delegations (struct super_block *sb); -void nfs_expire_all_delegations (struct nfs4_client *clp); -void nfs_handle_cb_pathdown (struct nfs4_client *clp); +void nfs_expire_all_delegations (struct nfs_client *clp); +void nfs_handle_cb_pathdown (struct nfs_client *clp); -void nfs_delegation_mark_reclaim (struct nfs4_client *clp); -void nfs_delegation_reap_unclaimed (struct nfs4_client *clp); +void nfs_delegation_mark_reclaim (struct nfs_client *clp); +void nfs_delegation_reap_unclaimed (struct nfs_client *clp);/* NFSv4 delegation-related procedures */ int nfs4_proc_delegreturn (struct inode *inode,struct rpc_cred *cred,const nfs4_stateid *stateid);
fs/nfs/idmap.c +6 -6
@@ -109,7 +109,7 @@ static struct rpc_pipe_ops idmap_upcall_ };void -nfs_idmap_new (struct nfs4_client *clp) +nfs_idmap_new (struct nfs_client *clp) {struct idmap *idmap;
@@ -138,7 +138,7 @@ nfs_idmap_new(struct nfs4_client *clp) }void -nfs_idmap_delete (struct nfs4_client *clp) +nfs_idmap_delete (struct nfs_client *clp) {struct idmap *idmap = clp->cl_idmap;
@@ -493,27 +493,27 @@ static unsigned int fnvhash32(const voidreturn (hash); } -int nfs_map_name_to_uid (struct nfs4_client *clp,const char *name,size_t namelen,__u32 *uid) +int nfs_map_name_to_uid (struct nfs_client *clp,const char *name,size_t namelen,__u32 *uid) {struct idmap *idmap = clp->cl_idmap;return nfs_idmap_id (idmap, &idmap->idmap_user_hash, name, namelen, uid); } -int nfs_map_group_to_gid (struct nfs4_client *clp,const char *name,size_t namelen,__u32 *uid) +int nfs_map_group_to_gid (struct nfs_client *clp,const char *name,size_t namelen,__u32 *uid) {struct idmap *idmap = clp->cl_idmap;return nfs_idmap_id (idmap, &idmap->idmap_group_hash, name, namelen, uid); } -int nfs_map_uid_to_name (struct nfs4_client *clp,__u32 uid,char *buf) +int nfs_map_uid_to_name (struct nfs_client *clp,__u32 uid,char *buf) {struct idmap *idmap = clp->cl_idmap;return nfs_idmap_name (idmap, &idmap->idmap_user_hash, uid, buf); } -int nfs_map_gid_to_group (struct nfs4_client *clp,__u32 uid,char *buf) +int nfs_map_gid_to_group (struct nfs_client *clp,__u32 uid,char *buf) {struct idmap *idmap = clp->cl_idmap;
fs/nfs/nfs4_fs.h +15 -15
@@ -43,9 +43,9 @@ enum nfs4_client_state { };/* -* The nfs4_client identifies our client state to the server. +* The nfs_client identifies our client state to the server. */ -struct nfs4_client { +struct nfs_client {struct list_head cl_servers;/* Global list of servers */ struct in_addr cl_addr;/* Server identifier */ u64 cl_clientid;/* constant */
@@ -127,7 +127,7 @@ static inline void nfs_confirm_seqid(strstruct nfs4_state_owner {spinlock_t so_lock;struct list_head so_list;/* per-clientid list of state_owners */ -struct nfs4_client *so_client; +struct nfs_client *so_client;u32 so_id;/* 32-bit identifier, unique */ atomic_t so_count;
@@ -210,10 +210,10 @@ extern ssize_t nfs4_listxattr(struct den/* nfs4proc.c */ extern int nfs4_map_errors (int err); -extern int nfs4_proc_setclientid (struct nfs4_client *,u32 ,unsigned short ,struct rpc_cred *); -extern int nfs4_proc_setclientid_confirm (struct nfs4_client *,struct rpc_cred *); -extern int nfs4_proc_async_renew (struct nfs4_client *,struct rpc_cred *); -extern int nfs4_proc_renew (struct nfs4_client *,struct rpc_cred *); +extern int nfs4_proc_setclientid (struct nfs_client *,u32 ,unsigned short ,struct rpc_cred *); +extern int nfs4_proc_setclientid_confirm (struct nfs_client *,struct rpc_cred *); +extern int nfs4_proc_async_renew (struct nfs_client *,struct rpc_cred *); +extern int nfs4_proc_renew (struct nfs_client *,struct rpc_cred *);extern int nfs4_do_close (struct inode *inode,struct nfs4_state *state);extern struct dentry *nfs4_atomic_open (struct inode *,struct dentry *,struct nameidata *);extern int nfs4_open_revalidate (struct inode *,struct dentry *,int ,struct nameidata *);
@@ -231,19 +231,19 @@ extern const u32 nfs4_fsinfo_bitmap[2];extern const u32 nfs4_fs_locations_bitmap[2 ];/* nfs4renewd.c */ -extern void nfs4_schedule_state_renewal (struct nfs4_client *); +extern void nfs4_schedule_state_renewal (struct nfs_client *);extern void nfs4_renewd_prepare_shutdown (struct nfs_server *); -extern void nfs4_kill_renewd (struct nfs4_client *); +extern void nfs4_kill_renewd (struct nfs_client *);extern void nfs4_renew_state (void *);/* nfs4state.c */ extern void init_nfsv4_state (struct nfs_server *);extern void destroy_nfsv4_state (struct nfs_server *); -extern struct nfs4_client *nfs4_get_client (struct in_addr *); -extern void nfs4_put_client (struct nfs4_client *clp); -extern struct nfs4_client *nfs4_find_client (struct in_addr *); -struct rpc_cred *nfs4_get_renew_cred (struct nfs4_client *clp); -extern u32 nfs4_alloc_lockowner_id (struct nfs4_client *); +extern struct nfs_client *nfs4_get_client (struct in_addr *); +extern void nfs4_put_client (struct nfs_client *clp); +extern struct nfs_client *nfs4_find_client (struct in_addr *); +struct rpc_cred *nfs4_get_renew_cred (struct nfs_client *clp); +extern u32 nfs4_alloc_lockowner_id (struct nfs_client *);extern struct nfs4_state_owner *nfs4_get_state_owner (struct nfs_server *,struct rpc_cred *);extern void nfs4_put_state_owner (struct nfs4_state_owner *);
@@ -252,7 +252,7 @@ extern struct nfs4_state * nfs4_get_openextern void nfs4_put_open_state (struct nfs4_state *);extern void nfs4_close_state (struct nfs4_state *,mode_t );extern void nfs4_state_set_mode_locked (struct nfs4_state *,mode_t ); -extern void nfs4_schedule_state_recovery (struct nfs4_client *); +extern void nfs4_schedule_state_recovery (struct nfs_client *);extern void nfs4_put_lock_state (struct nfs4_lock_state *lsp);extern int nfs4_set_lock_state (struct nfs4_state *state,struct file_lock *fl);extern void nfs4_copy_stateid (nfs4_stateid *,struct nfs4_state *,fl_owner_t );
fs/nfs/nfs4proc.c +16 -16
@@ -64,7 +64,7 @@ static int nfs4_do_fsinfo(struct nfs_serstatic int nfs4_async_handle_error (struct rpc_task *,const struct nfs_server *);static int _nfs4_proc_access (struct inode *inode,struct nfs_access_entry *entry);static int nfs4_handle_exception (const struct nfs_server *server,int errorcode,struct nfs4_exception *exception); -static int nfs4_wait_clnt_recover (struct rpc_clnt *clnt,struct nfs4_client *clp); +static int nfs4_wait_clnt_recover (struct rpc_clnt *clnt,struct nfs_client *clp);/* Prevent leaks of NFSv4 errors into userland */ int nfs4_map_errors (int err)
@@ -195,7 +195,7 @@ static void nfs4_setup_readdir(u64 cookistatic void renew_lease (const struct nfs_server *server,unsigned long timestamp) { -struct nfs4_client *clp = server->nfs4_state; +struct nfs_client *clp = server->nfs4_state;spin_lock (&clp->cl_lock);if (time_before (clp->cl_last_renewal,timestamp)) clp->cl_last_renewal = timestamp;
@@ -792,7 +792,7 @@ out:int nfs4_recover_expired_lease (struct nfs_server *server) { -struct nfs4_client *clp = server->nfs4_state; +struct nfs_client *clp = server->nfs4_state;if (test_and_clear_bit (NFS4CLNT_LEASE_EXPIRED , &clp->cl_state))nfs4_schedule_state_recovery (clp);
@@ -867,7 +867,7 @@ static int _nfs4_open_delegated(struct i {struct nfs_delegation *delegation;struct nfs_server *server =NFS_SERVER (inode); -struct nfs4_client *clp = server->nfs4_state; +struct nfs_client *clp = server->nfs4_state;struct nfs_inode *nfsi =NFS_I (inode);struct nfs4_state_owner *sp =NULL ;struct nfs4_state *state =NULL ;
@@ -953,7 +953,7 @@ static int _nfs4_do_open(struct inode *dstruct nfs4_state_owner *sp;struct nfs4_state *state =NULL ;struct nfs_server *server =NFS_SERVER (dir); -struct nfs4_client *clp = server->nfs4_state; +struct nfs_client *clp = server->nfs4_state;struct nfs4_opendata *opendata;int status;
@@ -2521,7 +2521,7 @@ static void nfs4_proc_commit_setup(struc*/ static void nfs4_renew_done (struct rpc_task *task,void *data) { -struct nfs4_client *clp = (struct nfs4_client *)task->tk_msg.rpc_argp; +struct nfs_client *clp = (struct nfs_client *)task->tk_msg.rpc_argp;unsigned long timestamp = (unsigned long )data;if (task->tk_status <0 ) {
@@ -2543,7 +2543,7 @@ static const struct rpc_call_ops nfs4_re .rpc_call_done = nfs4_renew_done, }; -int nfs4_proc_async_renew (struct nfs4_client *clp,struct rpc_cred *cred) +int nfs4_proc_async_renew (struct nfs_client *clp,struct rpc_cred *cred) {struct rpc_message msg = { .rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_RENEW ],
@@ -2555,7 +2555,7 @@ int nfs4_proc_async_renew(struct nfs4_cl &nfs4_renew_ops, (void *)jiffies); } -int nfs4_proc_renew (struct nfs4_client *clp,struct rpc_cred *cred) +int nfs4_proc_renew (struct nfs_client *clp,struct rpc_cred *cred) {struct rpc_message msg = { .rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_RENEW ],
@@ -2766,7 +2766,7 @@ static int nfs4_proc_set_acl(struct inodstatic int nfs4_async_handle_error (struct rpc_task *task,const struct nfs_server *server) { -struct nfs4_client *clp = server->nfs4_state; +struct nfs_client *clp = server->nfs4_state;if (!clp || task->tk_status >=0 )return 0 ;
@@ -2803,7 +2803,7 @@ static int nfs4_wait_bit_interruptible(vreturn 0 ; } -static int nfs4_wait_clnt_recover (struct rpc_clnt *clnt,struct nfs4_client *clp) +static int nfs4_wait_clnt_recover (struct rpc_clnt *clnt,struct nfs_client *clp) {sigset_t oldset;int res;
@@ -2846,7 +2846,7 @@ static int nfs4_delay(struct rpc_clnt *c*/ int nfs4_handle_exception (const struct nfs_server *server,int errorcode,struct nfs4_exception *exception) { -struct nfs4_client *clp = server->nfs4_state; +struct nfs_client *clp = server->nfs4_state;int ret = errorcode; exception->retry =0 ;
@@ -2873,7 +2873,7 @@ int nfs4_handle_exception(const struct nreturn nfs4_map_errors (ret); } -int nfs4_proc_setclientid (struct nfs4_client *clp,u32 program,unsigned short port,struct rpc_cred *cred) +int nfs4_proc_setclientid (struct nfs_client *clp,u32 program,unsigned short port,struct rpc_cred *cred) {nfs4_verifier sc_verifier;struct nfs4_setclientid setclientid = {
@@ -2920,7 +2920,7 @@ int nfs4_proc_setclientid(struct nfs4_clreturn status; } -static int _nfs4_proc_setclientid_confirm (struct nfs4_client *clp,struct rpc_cred *cred) +static int _nfs4_proc_setclientid_confirm (struct nfs_client *clp,struct rpc_cred *cred) {struct nfs_fsinfo fsinfo;struct rpc_message msg = {
@@ -2944,7 +2944,7 @@ static int _nfs4_proc_setclientid_confirreturn status; } -int nfs4_proc_setclientid_confirm (struct nfs4_client *clp,struct rpc_cred *cred) +int nfs4_proc_setclientid_confirm (struct nfs_client *clp,struct rpc_cred *cred) {long timeout;int err;
@@ -3081,7 +3081,7 @@ static int _nfs4_proc_getlk(struct nfs4_ {struct inode *inode = state->inode;struct nfs_server *server =NFS_SERVER (inode); -struct nfs4_client *clp = server->nfs4_state; +struct nfs_client *clp = server->nfs4_state;struct nfs_lockt_args arg = { .fh =NFS_FH (inode), .fl = request,
@@ -3488,7 +3488,7 @@ static int nfs4_lock_expired(struct nfs4static int _nfs4_proc_setlk (struct nfs4_state *state,int cmd,struct file_lock *request) { -struct nfs4_client *clp = state->owner->so_client; +struct nfs_client *clp = state->owner->so_client;unsigned char fl_flags = request->fl_flags;int status;
fs/nfs/nfs4renewd.c +4 -4
@@ -61,7 +61,7 @@ #define NFSDBG_FACILITY NFSDBG_PROCvoid nfs4_renew_state (void *data) { -struct nfs4_client *clp = (struct nfs4_client *)data; +struct nfs_client *clp = (struct nfs_client *)data;struct rpc_cred *cred;long lease, timeout;unsigned long last, now;
@@ -108,7 +108,7 @@ out:/* Must be called with clp->cl_sem locked for writes */ void -nfs4_schedule_state_renewal (struct nfs4_client *clp) +nfs4_schedule_state_renewal (struct nfs_client *clp) {long timeout;
@@ -127,7 +127,7 @@ nfs4_schedule_state_renewal(struct nfs4_void nfs4_renewd_prepare_shutdown (struct nfs_server *server) { -struct nfs4_client *clp = server->nfs4_state; +struct nfs_client *clp = server->nfs4_state;if (!clp)return ;
@@ -140,7 +140,7 @@ nfs4_renewd_prepare_shutdown(struct nfs_/* Must be called with clp->cl_sem locked for writes */ void -nfs4_kill_renewd (struct nfs4_client *clp) +nfs4_kill_renewd (struct nfs_client *clp) {down_read (&clp->cl_sem);if (!list_empty (&clp->cl_superblocks)) {
fs/nfs/nfs4state.c +25 -25
181 lines not on this page · raw message
fs/nfs/nfs4xdr.c +9 -9
@@ -1160,7 +1160,7 @@ static int encode_rename(struct xdr_strereturn 0 ; } -static int encode_renew (struct xdr_stream *xdr,const struct nfs4_client *client_stateid) +static int encode_renew (struct xdr_stream *xdr,const struct nfs_client *client_stateid) {uint32_t *p;
@@ -1246,7 +1246,7 @@ static int encode_setclientid(struct xdrreturn 0 ; } -static int encode_setclientid_confirm (struct xdr_stream *xdr,const struct nfs4_client *client_state) +static int encode_setclientid_confirm (struct xdr_stream *xdr,const struct nfs_client *client_state) {uint32_t *p;
@@ -1945,7 +1945,7 @@ static int nfs4_xdr_enc_server_caps(stru/* * a RENEW request */ -static int nfs4_xdr_enc_renew (struct rpc_rqst *req,uint32_t *p,struct nfs4_client *clp) +static int nfs4_xdr_enc_renew (struct rpc_rqst *req,uint32_t *p,struct nfs_client *clp) {struct xdr_stream xdr;struct compound_hdr hdr = {
@@ -1975,7 +1975,7 @@ static int nfs4_xdr_enc_setclientid(stru/* * a SETCLIENTID_CONFIRM request */ -static int nfs4_xdr_enc_setclientid_confirm (struct rpc_rqst *req,uint32_t *p,struct nfs4_client *clp) +static int nfs4_xdr_enc_setclientid_confirm (struct rpc_rqst *req,uint32_t *p,struct nfs_client *clp) {struct xdr_stream xdr;struct compound_hdr hdr = {
@@ -2132,7 +2132,7 @@ static int decode_op_hdr(struct xdr_stre }/* Dummy routine */ -static int decode_ace (struct xdr_stream *xdr,void *ace,struct nfs4_client *clp) +static int decode_ace (struct xdr_stream *xdr,void *ace,struct nfs_client *clp) {uint32_t *p;unsigned int strlen;
@@ -2636,7 +2636,7 @@ static int decode_attr_nlink(struct xdr_return 0 ; } -static int decode_attr_owner (struct xdr_stream *xdr,uint32_t *bitmap,struct nfs4_client *clp,int32_t *uid) +static int decode_attr_owner (struct xdr_stream *xdr,uint32_t *bitmap,struct nfs_client *clp,int32_t *uid) {uint32_t len, *p;
@@ -2660,7 +2660,7 @@ static int decode_attr_owner(struct xdr_return 0 ; } -static int decode_attr_group (struct xdr_stream *xdr,uint32_t *bitmap,struct nfs4_client *clp,int32_t *gid) +static int decode_attr_group (struct xdr_stream *xdr,uint32_t *bitmap,struct nfs_client *clp,int32_t *gid) {uint32_t len, *p;
@@ -3564,7 +3564,7 @@ static int decode_setattr(struct xdr_strreturn 0 ; } -static int decode_setclientid (struct xdr_stream *xdr,struct nfs4_client *clp) +static int decode_setclientid (struct xdr_stream *xdr,struct nfs_client *clp) {uint32_t *p;uint32_t opnum;
@@ -4334,7 +4334,7 @@ static int nfs4_xdr_dec_renew(struct rpc* a SETCLIENTID request */ static int nfs4_xdr_dec_setclientid (struct rpc_rqst *req,uint32_t *p, -struct nfs4_client *clp) +struct nfs_client *clp) {struct xdr_stream xdr;struct compound_hdr hdr;
fs/nfs/super.c +2 -2
@@ -1094,7 +1094,7 @@ #ifdef CONFIG_NFS_V4static struct rpc_clnt *nfs4_create_client (struct nfs_server *server,struct rpc_timeout *timeparms,int proto,rpc_authflavor_t flavor) { -struct nfs4_client *clp; +struct nfs_client *clp;struct rpc_xprt *xprt =NULL ;struct rpc_clnt *clnt =NULL ;int err = -EIO ;
@@ -1411,7 +1411,7 @@ static inline char *nfs4_dup_path(conststatic struct super_block *nfs4_clone_sb (struct nfs_server *server,struct nfs_clone_mount *data) {const struct dentry *dentry = data->dentry; -struct nfs4_client *clp = server->nfs4_state; +struct nfs_client *clp = server->nfs4_state;struct super_block *sb; server->fsid = data->fattr->fsid;
include/linux/nfs_fs_sb.h +1 -1
@@ -43,7 +43,7 @@ #ifdef CONFIG_NFS_V4*/ char ip_addr[16 ];char * mnt_path; -struct nfs4_client * nfs4_state;/* all NFSv4 state starts here */ +struct nfs_client * nfs4_state;/* all NFSv4 state starts here */ struct list_head nfs4_siblings;/* List of other nfs_server structs * that share the same clientid */
include/linux/nfs_idmap.h +7 -7
@@ -62,15 +62,15 @@ struct idmap_msg {#ifdef __KERNEL__/* Forward declaration to make this header independent of others */ -struct nfs4_client ; +struct nfs_client ; -void nfs_idmap_new (struct nfs4_client *); -void nfs_idmap_delete (struct nfs4_client *); +void nfs_idmap_new (struct nfs_client *); +void nfs_idmap_delete (struct nfs_client *); -int nfs_map_name_to_uid (struct nfs4_client *,const char *,size_t ,__u32 *); -int nfs_map_group_to_gid (struct nfs4_client *,const char *,size_t ,__u32 *); -int nfs_map_uid_to_name (struct nfs4_client *,__u32 ,char *); -int nfs_map_gid_to_group (struct nfs4_client *,__u32 ,char *); +int nfs_map_name_to_uid (struct nfs_client *,const char *,size_t ,__u32 *); +int nfs_map_group_to_gid (struct nfs_client *,const char *,size_t ,__u32 *); +int nfs_map_uid_to_name (struct nfs_client *,__u32 ,char *); +int nfs_map_gid_to_group (struct nfs_client *,__u32 ,char *);extern unsigned int nfs_idmap_cache_timeout;#endif /* __KERNEL__ */
David Howells
maintainerPATCH 6/30 NFS: Rename nfs_server::nfs4_state [try #11]
In reply to David HowellsRename nfs_server::nfs4_state to nfs_client as it will be used to represent the client state for NFS2 and NFS3 also.
---
fs/nfs/delegation.c | 12 ++++++------ fs/nfs/nfs4proc.c | 26 +++++++++++++------------- fs/nfs/nfs4renewd.c | 2 +- fs/nfs/nfs4state.c | 10 +++++----- fs/nfs/nfs4xdr.c | 10 +++++----- fs/nfs/super.c | 6 +++--- include/linux/nfs_fs_sb.h | 2 +- 7 files changed, 34 insertions(+), 34 deletions(-)
fs/nfs/delegation.c +6 -6
@@ -52,7 +52,7 @@ static int nfs_delegation_claim_locks(stcase -NFS4ERR_EXPIRED :/* kill_proc(fl->fl_pid, SIGLOST, 1); */ case -NFS4ERR_STALE_CLIENTID : -nfs4_schedule_state_recovery (NFS_SERVER (inode)->nfs4_state); +nfs4_schedule_state_recovery (NFS_SERVER (inode)->nfs_client); goto out_err; } }
@@ -114,7 +114,7 @@ void nfs_inode_reclaim_delegation(struct*/ int nfs_inode_set_delegation (struct inode *inode,struct rpc_cred *cred,struct nfs_openres *res) { -struct nfs_client *clp =NFS_SERVER (inode)->nfs4_state; +struct nfs_client *clp =NFS_SERVER (inode)->nfs_client;struct nfs_inode *nfsi =NFS_I (inode);struct nfs_delegation *delegation;int status =0 ;
@@ -176,7 +176,7 @@ static void nfs_msync_inode(struct inode*/ int __nfs_inode_return_delegation (struct inode *inode) { -struct nfs_client *clp =NFS_SERVER (inode)->nfs4_state; +struct nfs_client *clp =NFS_SERVER (inode)->nfs_client;struct nfs_inode *nfsi =NFS_I (inode);struct nfs_delegation *delegation;int res =0 ;
@@ -208,7 +208,7 @@ int __nfs_inode_return_delegation(struct*/ void nfs_return_all_delegations (struct super_block *sb) { -struct nfs_client *clp =NFS_SB (sb)->nfs4_state; +struct nfs_client *clp =NFS_SB (sb)->nfs_client;struct nfs_delegation *delegation;struct inode *inode;
@@ -310,7 +310,7 @@ static int recall_thread(void *data) {struct recall_threadargs *args = (struct recall_threadargs *)data;struct inode *inode =igrab (args->inode); -struct nfs_client *clp =NFS_SERVER (inode)->nfs4_state; +struct nfs_client *clp =NFS_SERVER (inode)->nfs_client;struct nfs_inode *nfsi =NFS_I (inode);struct nfs_delegation *delegation;
@@ -423,7 +423,7 @@ void nfs_delegation_reap_unclaimed(strucint nfs4_copy_delegation_stateid (nfs4_stateid *dst,struct inode *inode) { -struct nfs_client *clp =NFS_SERVER (inode)->nfs4_state; +struct nfs_client *clp =NFS_SERVER (inode)->nfs_client;struct nfs_inode *nfsi =NFS_I (inode);struct nfs_delegation *delegation;int res =0 ;
fs/nfs/nfs4proc.c +13 -13
@@ -195,7 +195,7 @@ static void nfs4_setup_readdir(u64 cookistatic void renew_lease (const struct nfs_server *server,unsigned long timestamp) { -struct nfs_client *clp = server->nfs4_state; +struct nfs_client *clp = server->nfs_client;spin_lock (&clp->cl_lock);if (time_before (clp->cl_last_renewal,timestamp)) clp->cl_last_renewal = timestamp;
@@ -252,7 +252,7 @@ static struct nfs4_opendata *nfs4_opendaatomic_inc (&sp->so_count); p->o_arg.fh =NFS_FH (dir); p->o_arg.open_flags = flags, - p->o_arg.clientid = server->nfs4_state->cl_clientid; + p->o_arg.clientid = server->nfs_client->cl_clientid; p->o_arg.id = sp->so_id; p->o_arg.name = &dentry->d_name; p->o_arg.server = server;
@@ -550,7 +550,7 @@ int nfs4_open_delegation_recall(struct dcase -NFS4ERR_STALE_STATEID :case -NFS4ERR_EXPIRED :/* Don't recall a delegation if it was lost */ -nfs4_schedule_state_recovery (server->nfs4_state); +nfs4_schedule_state_recovery (server->nfs_client);return err; } err =nfs4_handle_exception (server, err, &exception);
@@ -792,7 +792,7 @@ out:int nfs4_recover_expired_lease (struct nfs_server *server) { -struct nfs_client *clp = server->nfs4_state; +struct nfs_client *clp = server->nfs_client;if (test_and_clear_bit (NFS4CLNT_LEASE_EXPIRED , &clp->cl_state))nfs4_schedule_state_recovery (clp);
@@ -867,7 +867,7 @@ static int _nfs4_open_delegated(struct i {struct nfs_delegation *delegation;struct nfs_server *server =NFS_SERVER (inode); -struct nfs_client *clp = server->nfs4_state; +struct nfs_client *clp = server->nfs_client;struct nfs_inode *nfsi =NFS_I (inode);struct nfs4_state_owner *sp =NULL ;struct nfs4_state *state =NULL ;
@@ -953,7 +953,7 @@ static int _nfs4_do_open(struct inode *dstruct nfs4_state_owner *sp;struct nfs4_state *state =NULL ;struct nfs_server *server =NFS_SERVER (dir); -struct nfs_client *clp = server->nfs4_state; +struct nfs_client *clp = server->nfs_client;struct nfs4_opendata *opendata;int status;
@@ -1133,7 +1133,7 @@ static void nfs4_close_done(struct rpc_tbreak ;case -NFS4ERR_STALE_STATEID :case -NFS4ERR_EXPIRED : -nfs4_schedule_state_recovery (server->nfs4_state); +nfs4_schedule_state_recovery (server->nfs_client);break ;default :if (nfs4_async_handle_error (task, server) == -EAGAIN ) {
@@ -2766,7 +2766,7 @@ static int nfs4_proc_set_acl(struct inodstatic int nfs4_async_handle_error (struct rpc_task *task,const struct nfs_server *server) { -struct nfs_client *clp = server->nfs4_state; +struct nfs_client *clp = server->nfs_client;if (!clp || task->tk_status >=0 )return 0 ;
@@ -2846,7 +2846,7 @@ static int nfs4_delay(struct rpc_clnt *c*/ int nfs4_handle_exception (const struct nfs_server *server,int errorcode,struct nfs4_exception *exception) { -struct nfs_client *clp = server->nfs4_state; +struct nfs_client *clp = server->nfs_client;int ret = errorcode; exception->retry =0 ;
@@ -3052,7 +3052,7 @@ int nfs4_proc_delegreturn(struct inode *switch (err) {case -NFS4ERR_STALE_STATEID :case -NFS4ERR_EXPIRED : -nfs4_schedule_state_recovery (server->nfs4_state); +nfs4_schedule_state_recovery (server->nfs_client);case 0 :return 0 ; }
@@ -3081,7 +3081,7 @@ static int _nfs4_proc_getlk(struct nfs4_ {struct inode *inode = state->inode;struct nfs_server *server =NFS_SERVER (inode); -struct nfs_client *clp = server->nfs4_state; +struct nfs_client *clp = server->nfs_client;struct nfs_lockt_args arg = { .fh =NFS_FH (inode), .fl = request,
@@ -3206,7 +3206,7 @@ static void nfs4_locku_done(struct rpc_tbreak ;case -NFS4ERR_STALE_STATEID :case -NFS4ERR_EXPIRED : -nfs4_schedule_state_recovery (calldata->server->nfs4_state); +nfs4_schedule_state_recovery (calldata->server->nfs_client);break ;default :if (nfs4_async_handle_error (task, calldata->server) == -EAGAIN ) {
@@ -3318,7 +3318,7 @@ static struct nfs4_lockdata *nfs4_alloc_if (p->arg.lock_seqid ==NULL ) goto out_free; p->arg.lock_stateid = &lsp->ls_stateid; - p->arg.lock_owner.clientid = server->nfs4_state->cl_clientid; + p->arg.lock_owner.clientid = server->nfs_client->cl_clientid; p->arg.lock_owner.id = lsp->ls_id; p->lsp = lsp;atomic_inc (&lsp->ls_count);
fs/nfs/nfs4renewd.c +1 -1
@@ -127,7 +127,7 @@ nfs4_schedule_state_renewal(struct nfs_cvoid nfs4_renewd_prepare_shutdown (struct nfs_server *server) { -struct nfs_client *clp = server->nfs4_state; +struct nfs_client *clp = server->nfs_client;if (!clp)return ;
fs/nfs/nfs4state.c +5 -5
@@ -61,7 +61,7 @@ static LIST_HEAD(nfs4_clientid_list);void init_nfsv4_state (struct nfs_server *server) { - server->nfs4_state =NULL ; + server->nfs_client =NULL ;INIT_LIST_HEAD (&server->nfs4_siblings); }
@@ -70,9 +70,9 @@ destroy_nfsv4_state(struct nfs_server *s {kfree (server->mnt_path); server->mnt_path =NULL ; -if (server->nfs4_state) { -nfs4_put_client (server->nfs4_state); - server->nfs4_state =NULL ; +if (server->nfs_client) { +nfs4_put_client (server->nfs_client); + server->nfs_client =NULL ; } }
@@ -306,7 +306,7 @@ nfs4_drop_state_owner(struct nfs4_state_*/ struct nfs4_state_owner *nfs4_get_state_owner (struct nfs_server *server,struct rpc_cred *cred) { -struct nfs_client *clp = server->nfs4_state; +struct nfs_client *clp = server->nfs_client;struct nfs4_state_owner *sp, *new;get_rpccred (cred);
fs/nfs/nfs4xdr.c +5 -5
@@ -529,7 +529,7 @@ static int encode_attrs(struct xdr_streaif (iap->ia_valid &ATTR_MODE ) len +=4 ;if (iap->ia_valid &ATTR_UID ) { - owner_namelen =nfs_map_uid_to_name (server->nfs4_state, iap->ia_uid, owner_name); + owner_namelen =nfs_map_uid_to_name (server->nfs_client, iap->ia_uid, owner_name);if (owner_namelen <0 ) {printk (KERN_WARNING "nfs: couldn't resolve uid %d to string\n" , iap->ia_uid);
@@ -541,7 +541,7 @@ static int encode_attrs(struct xdr_strea len +=4 + (XDR_QUADLEN (owner_namelen) <<2 ); }if (iap->ia_valid &ATTR_GID ) { - owner_grouplen =nfs_map_gid_to_group (server->nfs4_state, iap->ia_gid, owner_group); + owner_grouplen =nfs_map_gid_to_group (server->nfs_client, iap->ia_gid, owner_group);if (owner_grouplen <0 ) {printk (KERN_WARNING "nfs4: couldn't resolve gid %d to string\n" , iap->ia_gid);
@@ -3051,9 +3051,9 @@ static int decode_getfattr(struct xdr_st fattr->mode |= fmode;if ((status =decode_attr_nlink (xdr, bitmap, &fattr->nlink)) !=0 ) goto xdr_error; -if ((status =decode_attr_owner (xdr, bitmap, server->nfs4_state, &fattr->uid)) !=0 ) +if ((status =decode_attr_owner (xdr, bitmap, server->nfs_client, &fattr->uid)) !=0 ) goto xdr_error; -if ((status =decode_attr_group (xdr, bitmap, server->nfs4_state, &fattr->gid)) !=0 ) +if ((status =decode_attr_group (xdr, bitmap, server->nfs_client, &fattr->gid)) !=0 ) goto xdr_error;if ((status =decode_attr_rdev (xdr, bitmap, &fattr->rdev)) !=0 ) goto xdr_error;
@@ -3254,7 +3254,7 @@ static int decode_delegation(struct xdr_if (decode_space_limit (xdr, &res->maxsize) <0 )return -EIO ; } -return decode_ace (xdr,NULL , res->server->nfs4_state); +return decode_ace (xdr,NULL , res->server->nfs_client); }static int decode_open (struct xdr_stream *xdr,struct nfs_openres *res)
fs/nfs/super.c +3 -3
@@ -1136,7 +1136,7 @@ static struct rpc_clnt *nfs4_create_clielist_add_tail (&server->nfs4_siblings, &clp->cl_superblocks); clnt =rpc_clone_client (clp->cl_rpcclient);if (!IS_ERR (clnt)) - server->nfs4_state = clp; + server->nfs_client = clp;up_write (&clp->cl_sem); clp =NULL ;
@@ -1146,7 +1146,7 @@ static struct rpc_clnt *nfs4_create_cliereturn clnt; } -if (server->nfs4_state->cl_idmap ==NULL ) { +if (server->nfs_client->cl_idmap ==NULL ) {dprintk ("%s: failed to create idmapper.\n" , __FUNCTION__);return ERR_PTR (-ENOMEM ); }
@@ -1411,7 +1411,7 @@ static inline char *nfs4_dup_path(conststatic struct super_block *nfs4_clone_sb (struct nfs_server *server,struct nfs_clone_mount *data) {const struct dentry *dentry = data->dentry; -struct nfs_client *clp = server->nfs4_state; +struct nfs_client *clp = server->nfs_client;struct super_block *sb; server->fsid = data->fattr->fsid;
include/linux/nfs_fs_sb.h +1 -1
@@ -43,7 +43,7 @@ #ifdef CONFIG_NFS_V4*/ char ip_addr[16 ];char * mnt_path; -struct nfs_client * nfs4_state;/* all NFSv4 state starts here */ +struct nfs_client * nfs_client;/* all NFSv4 state starts here */ struct list_head nfs4_siblings;/* List of other nfs_server structs * that share the same clientid */
David Howells
maintainerPATCH 7/30 NFS: Return an error when starting the idmapping pipe [try #11]
In reply to David HowellsReturn an error when starting the idmapping pipe so that we can detect it failing.
---
fs/nfs/idmap.c | 12 ++++++++---- fs/nfs/super.c | 3 ++- include/linux/nfs_idmap.h | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-)
fs/nfs/idmap.c +8 -4
@@ -108,15 +108,17 @@ static struct rpc_pipe_ops idmap_upcall_ .destroy_msg = idmap_pipe_destroy_msg, }; -void +int nfs_idmap_new (struct nfs_client *clp) {struct idmap *idmap; +int error;if (clp->cl_idmap !=NULL ) -return ; +return 0 ; +if ((idmap =kzalloc (sizeof (*idmap),GFP_KERNEL )) ==NULL ) -return ; +return -ENOMEM ;snprintf (idmap->idmap_path,sizeof (idmap->idmap_path),"%s/idmap" , clp->cl_rpcclient->cl_pathname);
@@ -124,8 +126,9 @@ nfs_idmap_new(struct nfs_client *clp) idmap->idmap_dentry =rpc_mkpipe (idmap->idmap_path, idmap, &idmap_upcall_ops,0 );if (IS_ERR (idmap->idmap_dentry)) { + error =PTR_ERR (idmap->idmap_dentry);kfree (idmap); -return ; +return error; }mutex_init (&idmap->idmap_lock);
@@ -135,6 +138,7 @@ nfs_idmap_new(struct nfs_client *clp) idmap->idmap_group_hash.h_type =IDMAP_TYPE_GROUP ; clp->cl_idmap = idmap; +return 0 ; }void
fs/nfs/super.c +2 -1
@@ -1131,7 +1131,8 @@ static struct rpc_clnt *nfs4_create_clie clnt->cl_softrtry =1 ; clp->cl_rpcclient = clnt;memcpy (clp->cl_ipaddr, server->ip_addr,sizeof (clp->cl_ipaddr)); -nfs_idmap_new (clp); +if (nfs_idmap_new (clp) <0 ) + goto out_fail; }list_add_tail (&server->nfs4_siblings, &clp->cl_superblocks); clnt =rpc_clone_client (clp->cl_rpcclient);
include/linux/nfs_idmap.h +1 -1
@@ -64,7 +64,7 @@ #ifdef __KERNEL__/* Forward declaration to make this header independent of others */ struct nfs_client ; -void nfs_idmap_new (struct nfs_client *); +int nfs_idmap_new (struct nfs_client *);void nfs_idmap_delete (struct nfs_client *);int nfs_map_name_to_uid (struct nfs_client *,const char *,size_t ,__u32 *);
David Howells
maintainerPATCH 8/30 NFS: Add a lookupfh NFS RPC op [try #11]
In reply to David HowellsAdd a lookup filehandle NFS RPC op so that a file handle can be looked up without requiring dentries and inodes and other VFS stuff when doing an NFS4 pathwalk during mounting.
---
fs/nfs/nfs4proc.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ include/linux/nfs_xdr.h | 3 +++ 2 files changed, 50 insertions(+), 0 deletions(-)
fs/nfs/nfs4proc.c +47 -0
@@ -1583,6 +1583,52 @@ nfs4_proc_setattr(struct dentry *dentry,return status; } +static int _nfs4_proc_lookupfh (struct nfs_server *server,struct nfs_fh *dirfh, +struct qstr *name,struct nfs_fh *fhandle, +struct nfs_fattr *fattr) +{ +int status; +struct nfs4_lookup_arg args = { + .bitmask = server->attr_bitmask, + .dir_fh = dirfh, + .name = name, + }; +struct nfs4_lookup_res res = { + .server = server, + .fattr = fattr, + .fh = fhandle, + }; +struct rpc_message msg = { + .rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_LOOKUP ], + .rpc_argp = &args, + .rpc_resp = &res, + }; + +nfs_fattr_init (fattr); + +dprintk ("NFS call lookupfh %s\n" , name->name); + status =rpc_call_sync (server->client, &msg,0 ); +dprintk ("NFS reply lookupfh: %d\n" , status); +if (status == -NFS4ERR_MOVED ) + status = -EREMOTE ; +return status; +} + +static int nfs4_proc_lookupfh (struct nfs_server *server,struct nfs_fh *dirfh, +struct qstr *name,struct nfs_fh *fhandle, +struct nfs_fattr *fattr) +{ +struct nfs4_exception exception = { }; +int err; +do { + err =nfs4_handle_exception (server, +_nfs4_proc_lookupfh (server, dirfh, name, + fhandle, fattr), + &exception); + }while (exception.retry); +return err; +} +static int _nfs4_proc_lookup (struct inode *dir,struct qstr *name,struct nfs_fh *fhandle,struct nfs_fattr *fattr) {
@@ -3698,6 +3744,7 @@ struct nfs_rpc_ops nfs_v4_clientops = { .getroot = nfs4_proc_get_root, .getattr = nfs4_proc_getattr, .setattr = nfs4_proc_setattr, + .lookupfh = nfs4_proc_lookupfh, .lookup = nfs4_proc_lookup, .access = nfs4_proc_access, .readlink = nfs4_proc_readlink,
include/linux/nfs_xdr.h +3 -0
@@ -770,6 +770,9 @@ struct nfs_rpc_ops {int (*getroot) (struct nfs_server *,struct nfs_fh *,struct nfs_fsinfo *); +int (*lookupfh)(struct nfs_server *,struct nfs_fh *, +struct qstr *,struct nfs_fh *, +struct nfs_fattr *);int (*getattr) (struct nfs_server *,struct nfs_fh *,struct nfs_fattr *); int (*setattr) (struct dentry *, struct nfs_fattr *,
David Howells
maintainerPATCH 9/30 NFS: Add a server capabilities NFS RPC op [try #11]
In reply to David HowellsAdd a set_capabilities NFS RPC op so that the server capabilities can be set.
---
fs/nfs/nfs4proc.c | 1 + include/linux/nfs_xdr.h | 1 + 2 files changed, 2 insertions(+), 0 deletions(-)
fs/nfs/nfs4proc.c +1 -0
@@ -3765,6 +3765,7 @@ struct nfs_rpc_ops nfs_v4_clientops = { .statfs = nfs4_proc_statfs, .fsinfo = nfs4_proc_fsinfo, .pathconf = nfs4_proc_pathconf, + .set_capabilities = nfs4_server_capabilities, .decode_dirent = nfs4_decode_dirent, .read_setup = nfs4_proc_read_setup, .read_done = nfs4_read_done,
include/linux/nfs_xdr.h +1 -0
@@ -809,6 +809,7 @@ struct nfs_rpc_ops { struct nfs_fsinfo *);int (*pathconf) (struct nfs_server *,struct nfs_fh *,struct nfs_pathconf *); +int (*set_capabilities)(struct nfs_server *,struct nfs_fh *);u32 * (*decode_dirent)(u32 *,struct nfs_entry *,int plus);void (*read_setup) (struct nfs_read_data *);int (*read_done) (struct rpc_task *,struct nfs_read_data *);
David Howells
maintainerPATCH 10/30 NFS: Generalise the nfs_client structure [try #11]
In reply to David HowellsGeneralise the nfs_client structure by:
(1) Moving nfs_client to a more general place (nfs_fs_sb.h).
(2) Renaming its maintenance routines to be non-NFS4 specific.
(3) Move those maintenance routines to a new non-NFS4 specific file (client.c) and move the declarations to internal.h.
(4) Make nfs_find/get_client() take a full sockaddr_in to include the port number (will be required for NFS2/3).
(5) Make nfs_find/get_client() take the NFS protocol version (again will be required to differentiate NFS2, 3 & 4 client records).
Also:
(6) Make nfs_client construction proceed akin to inodes, marking them as under construction and providing a function to indicate completion.
(7) Make nfs_get_client() wait interruptibly if it finds a client that it can share, but that client is currently being constructed.
(8) Make nfs4_create_client() use (6) and (7) instead of locking cl_sem.
---
fs/nfs/Makefile | 6 - fs/nfs/callback.c | 9 + fs/nfs/callback_proc.c | 9 + fs/nfs/client.c | 312 +++++++++++++++++++++++++++++++++++++++++++++ fs/nfs/delegation.c | 9 + fs/nfs/internal.h | 6 + fs/nfs/nfs4_fs.h | 52 -------- fs/nfs/nfs4proc.c | 2 fs/nfs/nfs4state.c | 128 +----------------- fs/nfs/super.c | 53 +++----- include/linux/nfs_fs.h | 1 include/linux/nfs_fs_sb.h | 60 +++++++++ 12 files changed, 425 insertions(+), 222 deletions(-)
fs/nfs/Makefile +3 -3
@@ -4,9 +4,9 @@ # obj-$(CONFIG_NFS_FS) += nfs.o -nfs-y := dir.o file.o inode.o super.o nfs2xdr.o pagelist.o \ - proc.o read.o symlink.o unlink.o write.o \ - namespace.o +nfs-y := client.o dir.o file.o inode.o super.o nfs2xdr.o \ + pagelist.o proc.o read.o symlink.o unlink.o \ + write.o namespace.o nfs-$(CONFIG_ROOT_NFS) += nfsroot.o mount_clnt.o nfs-$(CONFIG_NFS_V3) += nfs3proc.o nfs3xdr.o nfs-$(CONFIG_NFS_V3_ACL) += nfs3acl.o
fs/nfs/callback.c +5 -4
@@ -19,6 +19,7 @@ #include <net/inet_sock.h>#include "nfs4_fs.h" #include "callback.h" +#include "internal.h" #define NFSDBG_FACILITY NFSDBG_CALLBACK
@@ -166,15 +167,15 @@ void nfs_callback_down(void)static int nfs_callback_authenticate (struct svc_rqst *rqstp) { -struct in_addr *addr = &rqstp->rq_addr.sin_addr; +struct sockaddr_in *addr = &rqstp->rq_addr;struct nfs_client *clp;/* Don't talk to strangers */ - clp =nfs4_find_client (addr); + clp =nfs_find_client (addr,4 );if (clp ==NULL )return SVC_DROP ; -dprintk ("%s: %u.%u.%u.%u NFSv4 callback!\n" , __FUNCTION__,NIPQUAD (addr)); -nfs4_put_client (clp); +dprintk ("%s: %u.%u.%u.%u NFSv4 callback!\n" , __FUNCTION__,NIPQUAD (addr->sin_addr)); +nfs_put_client (clp);switch (rqstp->rq_authop->flavour) {case RPC_AUTH_NULL :if (rqstp->rq_proc !=CB_NULL )
fs/nfs/callback_proc.c +5 -4
@@ -10,6 +10,7 @@ #include <linux/nfs_fs.h>#include "nfs4_fs.h" #include "callback.h" #include "delegation.h" +#include "internal.h" #define NFSDBG_FACILITY NFSDBG_CALLBACK
@@ -22,7 +23,7 @@ unsigned nfs4_callback_getattr(struct cb res->bitmap[0 ] = res->bitmap[1 ] =0 ; res->status =htonl (NFS4ERR_BADHANDLE ); - clp =nfs4_find_client (&args->addr->sin_addr); + clp =nfs_find_client (args->addr,4 );if (clp ==NULL ) goto out; inode =nfs_delegation_find_inode (clp, &args->fh);
@@ -48,7 +49,7 @@ out_iput:up_read (&nfsi->rwsem);iput (inode); out_putclient: -nfs4_put_client (clp); +nfs_put_client (clp); out:dprintk ("%s: exit with status = %d\n" , __FUNCTION__,ntohl (res->status));return res->status;
@@ -61,7 +62,7 @@ unsigned nfs4_callback_recall(struct cb_unsigned res; res =htonl (NFS4ERR_BADHANDLE ); - clp =nfs4_find_client (&args->addr->sin_addr); + clp =nfs_find_client (args->addr,4 );if (clp ==NULL ) goto out; inode =nfs_delegation_find_inode (clp, &args->fh);
@@ -80,7 +81,7 @@ unsigned nfs4_callback_recall(struct cb_ }iput (inode); out_putclient: -nfs4_put_client (clp); +nfs_put_client (clp); out:dprintk ("%s: exit with status = %d\n" , __FUNCTION__,ntohl (res));return res;
fs/nfs/client.c new file +312 -0
312 lines not on this page · raw message
fs/nfs/delegation.c +5 -4
@@ -18,6 +18,7 @@ #include <linux/nfs_xdr.h>#include "nfs4_fs.h" #include "delegation.h" +#include "internal.h" static struct nfs_delegation *nfs_alloc_delegation (void ) {
@@ -145,7 +146,7 @@ int nfs_inode_set_delegation(struct inod sizeof(delegation->stateid)) != 0 || delegation->type != nfsi->delegation->type) {printk ("%s: server %u.%u.%u.%u, handed out a duplicate delegation!\n" , - __FUNCTION__,NIPQUAD (clp->cl_addr)); + __FUNCTION__,NIPQUAD (clp->cl_addr.sin_addr)); status = -EIO ; } }
@@ -254,7 +255,7 @@ restart: } out:spin_unlock (&clp->cl_lock); -nfs4_put_client (clp); +nfs_put_client (clp);module_put_and_exit (0 ); }
@@ -266,10 +267,10 @@ void nfs_expire_all_delegations(struct natomic_inc (&clp->cl_count); task =kthread_run (nfs_do_expire_all_delegations, clp,"%u.%u.%u.%u-delegreturn" , -NIPQUAD (clp->cl_addr)); +NIPQUAD (clp->cl_addr.sin_addr));if (!IS_ERR (task))return ; -nfs4_put_client (clp); +nfs_put_client (clp);module_put (THIS_MODULE ); }
fs/nfs/internal.h +6 -0
@@ -15,6 +15,12 @@ struct nfs_clone_mount {rpc_authflavor_t authflavor; }; +/* client.c */ +extern void nfs_put_client (struct nfs_client *); +extern struct nfs_client *nfs_find_client (const struct sockaddr_in *,int ); +extern struct nfs_client *nfs_get_client (const char *,const struct sockaddr_in *,int ); +extern void nfs_mark_client_ready (struct nfs_client *,int ); +/* nfs4namespace.c */ #ifdef CONFIG_NFS_V4 extern struct vfsmount *nfs_do_refmount (const struct vfsmount *mnt_parent,struct dentry *dentry);
fs/nfs/nfs4_fs.h +0 -52
64 lines not on this page · raw message
fs/nfs/nfs4proc.c +1 -1
@@ -2943,7 +2943,7 @@ int nfs4_proc_setclientid(struct nfs_clifor (;;) { setclientid.sc_name_len =scnprintf (setclientid.sc_name,sizeof (setclientid.sc_name),"%s/%u.%u.%u.%u %s %u" , - clp->cl_ipaddr,NIPQUAD (clp->cl_addr.s_addr), + clp->cl_ipaddr,NIPQUAD (clp->cl_addr.sin_addr), cred->cr_ops->cr_name, clp->cl_id_uniquifier); setclientid.sc_netid_len = scnprintf(setclientid.sc_netid,
fs/nfs/nfs4state.c +6 -122
168 lines not on this page · raw message
fs/nfs/super.c +21 -32
112 lines not on this page · raw message
include/linux/nfs_fs.h +1 -0
@@ -581,6 +581,7 @@ #define NFSDBG_XDR 0x0020#define NFSDBG_FILE 0x0040#define NFSDBG_ROOT 0x0080#define NFSDBG_CALLBACK 0x0100 +#define NFSDBG_CLIENT 0x0200#define NFSDBG_ALL 0xFFFF#ifdef __KERNEL__
include/linux/nfs_fs_sb.h +60 -0
66 lines not on this page · raw message
David Howells
maintainerPATCH 11/30 NFS: Use the dentry superblock directly in nfs_statfs() [try #11]
In reply to David HowellsUse the nominated dentry's superblock directly in the NFS statfs() op to get a file handle, rather than using s_root (which will become a dummy dentry in a future patch).
---
fs/nfs/super.c | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-)
fs/nfs/super.c +6 -7
@@ -235,11 +235,10 @@ #endif*/ static int nfs_statfs (struct dentry *dentry,struct kstatfs *buf) { -struct super_block *sb = dentry->d_sb; -struct nfs_server *server =NFS_SB (sb); +struct nfs_server *server =NFS_SB (dentry->d_sb);unsigned char blockbits;unsigned long blockres; -struct nfs_fh *rootfh =NFS_FH (sb->s_root->d_inode); +struct nfs_fh *fh =NFS_FH (dentry->d_inode);struct nfs_fattr fattr;struct nfs_fsstat res = { .fattr = &fattr,
@@ -248,7 +247,7 @@ static int nfs_statfs(struct dentry *denlock_kernel (); - error = server->rpc_ops->statfs (server, rootfh, &res); + error = server->rpc_ops->statfs (server, fh, &res); buf->f_type =NFS_SUPER_MAGIC ;if (error <0 ) goto out_err;
@@ -258,7 +257,7 @@ static int nfs_statfs(struct dentry *den* case where f_frsize != f_bsize. Eventually we want to * report the value of wtmult in this field. */ - buf->f_frsize = sb->s_blocksize; + buf->f_frsize = dentry->d_sb->s_blocksize;/* * On most *nix systems, f_blocks, f_bfree, and f_bavail
@@ -267,8 +266,8 @@ static int nfs_statfs(struct dentry *den* thus historically Linux's sys_statfs reports these * fields in units of f_bsize. */ - buf->f_bsize = sb->s_blocksize; - blockbits = sb->s_blocksize_bits; + buf->f_bsize = dentry->d_sb->s_blocksize; + blockbits = dentry->d_sb->s_blocksize_bits; blockres = (1 << blockbits) -1 ; buf->f_blocks = (res.tbytes + blockres) >> blockbits; buf->f_bfree = (res.fbytes + blockres) >> blockbits;
David Howells
maintainerPATCH 12/30 NFS: Add extra const qualifiers [try #11]
In reply to David HowellsAdd some extra const qualifiers into NFS.
---
fs/nfs/namespace.c | 3 ++- fs/nfs/nfs3proc.c | 2 +- fs/nfs/nfs4namespace.c | 8 ++++---- fs/nfs/nfs4proc.c | 2 +- fs/nfs/proc.c | 2 +- fs/nfs/super.c | 10 +++++----- include/linux/nfs_fs_sb.h | 2 +- include/linux/nfs_xdr.h | 6 +++--- 8 files changed, 18 insertions(+), 17 deletions(-)
fs/nfs/namespace.c +2 -1
@@ -170,7 +170,8 @@ void nfs_release_automount_timer(void)/* * Clone a mountpoint of the appropriate type */ -static struct vfsmount *nfs_do_clone_mount (struct nfs_server *server,char *devname, +static struct vfsmount *nfs_do_clone_mount (struct nfs_server *server, +const char *devname,struct nfs_clone_mount *mountdata) {#ifdef CONFIG_NFS_V4
fs/nfs/nfs3proc.c +1 -1
@@ -886,7 +886,7 @@ nfs3_proc_lock(struct file *filp, int cmreturn nlmclnt_proc (filp->f_dentry->d_inode, cmd, fl); } -struct nfs_rpc_ops nfs_v3_clientops = { +const struct nfs_rpc_ops nfs_v3_clientops = { .version =3 ,/* protocol version */ .dentry_ops = &nfs_dentry_operations, .dir_inode_ops = &nfs3_dir_inode_operations,
fs/nfs/nfs4namespace.c +4 -4
@@ -23,7 +23,7 @@ #define NFSDBG_FACILITY NFSDBG_VFS/* * Check if fs_root is valid */ -static inline char *nfs4_pathname_string (struct nfs4_pathname *pathname, +static inline char *nfs4_pathname_string (const struct nfs4_pathname *pathname,char *buffer,ssize_t buflen) {char *end = buffer + buflen;
@@ -34,7 +34,7 @@ static inline char *nfs4_pathname_string n = pathname->ncomponents;while (--n >=0 ) { -struct nfs4_string *component = &pathname->components[n]; +const struct nfs4_string *component = &pathname->components[n]; buflen -= component->len +1 ;if (buflen <0 ) goto Elong;
@@ -60,7 +60,7 @@ Elong:*/ static struct vfsmount *nfs_follow_referral (const struct vfsmount *mnt_parent,const struct dentry *dentry, -struct nfs4_fs_locations *locations) +const struct nfs4_fs_locations *locations) {struct vfsmount *mnt =ERR_PTR (-ENOENT );struct nfs_clone_mount mountdata = {
@@ -108,7 +108,7 @@ static struct vfsmount *nfs_follow_refer loc =0 ;while (loc < locations->nlocations &&IS_ERR (mnt)) { -struct nfs4_fs_location *location = &locations->locations[loc]; +const struct nfs4_fs_location *location = &locations->locations[loc];char *mnt_path; if (location == NULL || location->nservers <= 0 ||
fs/nfs/nfs4proc.c +1 -1
@@ -3736,7 +3736,7 @@ static struct inode_operations nfs4_file .listxattr = nfs4_listxattr, }; -struct nfs_rpc_ops nfs_v4_clientops = { +const struct nfs_rpc_ops nfs_v4_clientops = { .version =4 ,/* protocol version */ .dentry_ops = &nfs4_dentry_operations, .dir_inode_ops = &nfs4_dir_inode_operations,
fs/nfs/proc.c +1 -1
@@ -671,7 +671,7 @@ nfs_proc_lock(struct file *filp, int cmd } -struct nfs_rpc_ops nfs_v2_clientops = { +const struct nfs_rpc_ops nfs_v2_clientops = { .version =2 ,/* protocol version */ .dentry_ops = &nfs_dentry_operations, .dir_inode_ops = &nfs_dir_inode_operations,
fs/nfs/super.c +5 -5
@@ -324,10 +324,10 @@ static const char *nfs_pseudoflavour_to_*/ static void nfs_show_mount_options (struct seq_file *m,struct nfs_server *nfss,int showdefaults) { -static struct proc_nfs_info { +static const struct proc_nfs_info {int flag; -char *str; -char *nostr; +const char *str; +const char *nostr; } nfs_info[] = { {NFS_MOUNT_SOFT ,",soft" ,",hard" }, {NFS_MOUNT_INTR ,",intr" ,"" },
@@ -337,9 +337,9 @@ static void nfs_show_mount_options(struc { NFS_MOUNT_NOACL, ",noacl", "" }, { 0, NULL, NULL } }; -struct proc_nfs_info *nfs_infop; +const struct proc_nfs_info *nfs_infop;char buf[12 ]; -char *proto; +const char *proto;seq_printf (m,",vers=%d" , nfss->rpc_ops->version);seq_printf (m,",rsize=%d" , nfss->rsize);
include/linux/nfs_fs_sb.h +1 -1
@@ -73,7 +73,7 @@ struct nfs_server {struct rpc_clnt * client;/* RPC client handle */ struct rpc_clnt * client_sys;/* 2nd handle for FSINFO */ struct rpc_clnt * client_acl;/* ACL RPC client handle */ -struct nfs_rpc_ops * rpc_ops;/* NFS protocol vector */ +const struct nfs_rpc_ops *rpc_ops;/* NFS protocol vector */ struct nfs_iostats * io_stats;/* I/O statistics */ struct backing_dev_info backing_dev_info;int flags;/* various flags */
include/linux/nfs_xdr.h +3 -3
@@ -833,9 +833,9 @@ #define NFS_CALL(op, inode, args) NFS_PR/* * Function vectors etc. for the NFS client */ -extern struct nfs_rpc_ops nfs_v2_clientops; -extern struct nfs_rpc_ops nfs_v3_clientops; -extern struct nfs_rpc_ops nfs_v4_clientops; +extern const struct nfs_rpc_ops nfs_v2_clientops; +extern const struct nfs_rpc_ops nfs_v3_clientops; +extern const struct nfs_rpc_ops nfs_v4_clientops;extern struct rpc_version nfs_version2;extern struct rpc_version nfs_version3;extern struct rpc_version nfs_version4;
David Howells
maintainerPATCH 13/30 NFS: Maintain a common server record for NFS2/3 as well as for NFS4 [try #11]
In reply to David HowellsMaintain a common server record for NFS2/3 as well as for NFS4 so that common stuff can be moved there from struct nfs_server.
---
fs/nfs/super.c | 21 ++++++++++++++++++++- include/linux/nfs_fs_sb.h | 2 +- 2 files changed, 21 insertions(+), 2 deletions(-)
fs/nfs/super.c +20 -1
@@ -653,11 +653,19 @@ static void nfs_init_timeout_values(strustatic struct rpc_clnt *nfs_create_client (struct nfs_server *server,const struct nfs_mount_data *data) { +struct nfs_client *clp;struct rpc_timeout timeparms;struct rpc_xprt *xprt =NULL ;struct rpc_clnt *clnt =NULL ;int proto = (data->flags &NFS_MOUNT_TCP ) ?IPPROTO_TCP :IPPROTO_UDP ; + clp =nfs_get_client (server->hostname, &server->addr, + server->rpc_ops->version); +if (!clp) { +dprintk ("%s: failed to create NFS4 client.\n" , __FUNCTION__); +return ERR_PTR (PTR_ERR (clp)); + } +nfs_init_timeout_values (&timeparms, proto, data->timeo, data->retrans); server->retrans_timeo = timeparms.to_initval;
@@ -668,6 +676,8 @@ nfs_create_client(struct nfs_server *serif (IS_ERR (xprt)) {dprintk ("%s: cannot create RPC transport. Error = %ld\n" , __FUNCTION__,PTR_ERR (xprt)); +nfs_mark_client_ready (clp,PTR_ERR (xprt)); +nfs_put_client (clp);return (struct rpc_clnt *)xprt; } clnt = rpc_create_client(xprt, server->hostname, &nfs_program,
@@ -681,9 +691,13 @@ nfs_create_client(struct nfs_server *ser clnt->cl_intr =1 ; clnt->cl_softrtry =1 ; +nfs_mark_client_ready (clp,0 ); + server->nfs_client = clp;return clnt; out_fail: +nfs_mark_client_ready (clp,PTR_ERR (xprt)); +nfs_put_client (clp);return clnt; }
@@ -759,6 +773,7 @@ static int nfs_clone_generic_sb(struct nif (server ==NULL ) goto out_err;memcpy (server, parent,sizeof (*server)); +atomic_inc (&server->nfs_client->cl_count); hostname = (data->hostname !=NULL ) ? data->hostname : parent->hostname; len =strlen (hostname) +1 ; server->hostname =kmalloc (len,GFP_KERNEL );
@@ -791,6 +806,7 @@ out_deactivate: out_rpciod_down:rpciod_down ();kfree (server->hostname); +nfs_put_client (server->nfs_client);kfree (server);return simple_set_mnt (mnt, sb); kill_rpciod:
@@ -798,6 +814,7 @@ kill_rpciod: free_hostname:kfree (server->hostname); free_server: +nfs_put_client (server->nfs_client);kfree (server); out_err:return error;
@@ -1066,6 +1083,7 @@ static void nfs_kill_super(struct super_nfs_free_iostats (server->io_stats);kfree (server->hostname); +nfs_put_client (server->nfs_client);kfree (server);nfs_release_automount_timer (); }
@@ -1416,7 +1434,6 @@ static struct super_block *nfs4_clone_sbnfs4_server_capabilities (server, &server->fh);down_write (&clp->cl_sem); -atomic_inc (&clp->cl_count);list_add_tail (&server->nfs4_siblings, &clp->cl_superblocks);up_write (&clp->cl_sem);return sb;
@@ -1471,6 +1488,8 @@ static struct nfs_server *nfs4_referral_ retrans =1 ;nfs_init_timeout_values (&timeparms, proto, timeo, retrans); +nfs_put_client (server->nfs_client); + server->nfs_client =NULL ; server->client =nfs4_create_client (server, &timeparms, proto, data->authflavor);if (IS_ERR ((err = server->client))) goto out_err;
include/linux/nfs_fs_sb.h +1 -1
@@ -70,6 +70,7 @@ #endif* NFS client parameters stored in the superblock. */ struct nfs_server { +struct nfs_client * nfs_client;/* shared client and NFS4 state */ struct rpc_clnt * client;/* RPC client handle */ struct rpc_clnt * client_sys;/* 2nd handle for FSINFO */ struct rpc_clnt * client_acl;/* ACL RPC client handle */
@@ -103,7 +104,6 @@ #ifdef CONFIG_NFS_V4*/ char ip_addr[16 ];char * mnt_path; -struct nfs_client * nfs_client;/* all NFSv4 state starts here */ struct list_head nfs4_siblings;/* List of other nfs_server structs * that share the same clientid */
David Howells
maintainerPATCH 14/30 NFS: Make better use of inode* dereferencing macros [try #11]
In reply to David HowellsMake better use of inode* dereferencing macros to hide dereferencing chains (including NFS_PROTO and NFS_CLIENT).
---
fs/nfs/file.c | 2 +- fs/nfs/nfs4proc.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-)
fs/nfs/file.c +1 -1
@@ -111,7 +111,7 @@ nfs_file_open(struct inode *inode, strucnfs_inc_stats (inode,NFSIOS_VFSOPEN );lock_kernel (); - res =NFS_SERVER (inode)->rpc_ops->file_open (inode, filp); + res =NFS_PROTO (inode)->file_open (inode, filp);unlock_kernel ();return res; }
fs/nfs/nfs4proc.c +5 -5
@@ -1268,7 +1268,7 @@ nfs4_atomic_open(struct inode *dir, struBUG_ON (nd->intent.open.flags &O_CREAT ); } - cred =rpcauth_lookupcred (NFS_SERVER (dir)->client->cl_auth,0 ); + cred =rpcauth_lookupcred (NFS_CLIENT (dir)->cl_auth,0 );if (IS_ERR (cred))return (struct dentry *)cred; state =nfs4_do_open (dir, dentry, nd->intent.open.flags, &attr, cred);
@@ -1291,7 +1291,7 @@ nfs4_open_revalidate(struct inode *dir,struct rpc_cred *cred;struct nfs4_state *state; - cred =rpcauth_lookupcred (NFS_SERVER (dir)->client->cl_auth,0 ); + cred =rpcauth_lookupcred (NFS_CLIENT (dir)->cl_auth,0 );if (IS_ERR (cred))return PTR_ERR (cred); state =nfs4_open_delegated (dentry->d_inode, openflags, cred);
@@ -1565,7 +1565,7 @@ nfs4_proc_setattr(struct dentry *dentry,nfs_fattr_init (fattr); - cred =rpcauth_lookupcred (NFS_SERVER (inode)->client->cl_auth,0 ); + cred =rpcauth_lookupcred (NFS_CLIENT (inode)->cl_auth,0 );if (IS_ERR (cred))return PTR_ERR (cred);
@@ -1927,7 +1927,7 @@ nfs4_proc_create(struct inode *dir, strustruct rpc_cred *cred;int status =0 ; - cred =rpcauth_lookupcred (NFS_SERVER (dir)->client->cl_auth,0 ); + cred =rpcauth_lookupcred (NFS_CLIENT (dir)->cl_auth,0 );if (IS_ERR (cred)) { status =PTR_ERR (cred); goto out;
@@ -2803,7 +2803,7 @@ static int nfs4_proc_set_acl(struct inodreturn -EOPNOTSUPP ;nfs_inode_return_delegation (inode);buf_to_pages (buf, buflen, arg.acl_pages, &arg.acl_pgbase); - ret =rpc_call_sync (NFS_SERVER (inode)->client, &msg,0 ); + ret =rpc_call_sync (NFS_CLIENT (inode), &msg,0 );if (ret ==0 )nfs4_write_cached_acl (inode, buf, buflen);return ret;
David Howells
maintainerPATCH 15/30 NFS: Move rpc_ops from nfs_server to nfs_client [try #11]
In reply to David HowellsMove the rpc_ops from the nfs_server struct to the nfs_client struct as they're common to all server records of a particular NFS protocol version.
---
fs/nfs/dir.c | 2 +- fs/nfs/inode.c | 4 ++- fs/nfs/namespace.c | 6 +++-- fs/nfs/nfs4proc.c | 2 +- fs/nfs/super.c | 59 +++++++++++++++++++++++++-------------------- include/linux/nfs_fs.h | 2 +- include/linux/nfs_fs_sb.h | 2 +- 7 files changed, 43 insertions(+), 34 deletions(-)
fs/nfs/dir.c +1 -1
@@ -1147,7 +1147,7 @@ int nfs_instantiate(struct dentry *dentr }if (!(fattr->valid &NFS_ATTR_FATTR )) {struct nfs_server *server =NFS_SB (dentry->d_sb); - error = server->rpc_ops->getattr (server, fhandle, fattr); + error = server->nfs_client->rpc_ops->getattr (server, fhandle, fattr);if (error <0 ) goto out_err; }
fs/nfs/inode.c +2 -2
@@ -242,13 +242,13 @@ nfs_fhget(struct super_block *sb, struct/* Why so? Because we want revalidate for devices/FIFOs, and * that's precisely what we have in nfs_file_inode_operations. */ - inode->i_op =NFS_SB (sb)->rpc_ops->file_inode_ops; + inode->i_op =NFS_SB (sb)->nfs_client->rpc_ops->file_inode_ops;if (S_ISREG (inode->i_mode)) { inode->i_fop = &nfs_file_operations; inode->i_data.a_ops = &nfs_file_aops; inode->i_data.backing_dev_info = &NFS_SB (sb)->backing_dev_info; }else if (S_ISDIR (inode->i_mode)) { - inode->i_op =NFS_SB (sb)->rpc_ops->dir_inode_ops; + inode->i_op =NFS_SB (sb)->nfs_client->rpc_ops->dir_inode_ops; inode->i_fop = &nfs_dir_operations;if (nfs_server_capable (inode,NFS_CAP_READDIRPLUS ) && fattr->size <=NFS_LIMIT_READDIRPLUS )
fs/nfs/namespace.c +4 -2
@@ -102,7 +102,9 @@ static void * nfs_follow_mountpoint(stru goto out_follow;/* Look it up again */ parent =dget_parent (nd->dentry); - err = server->rpc_ops->lookup (parent->d_inode, &nd->dentry->d_name, &fh, &fattr); + err = server->nfs_client->rpc_ops->lookup (parent->d_inode, + &nd->dentry->d_name, + &fh, &fattr);dput (parent);if (err !=0 ) goto out_err;
@@ -176,7 +178,7 @@ static struct vfsmount *nfs_do_clone_mou {#ifdef CONFIG_NFS_V4 struct vfsmount *mnt =NULL ; -switch (server->rpc_ops->version) { +switch (server->nfs_client->cl_nfsversion) {case 2 :case 3 : mnt =vfs_kern_mount (&clone_nfs_fs_type,0 , devname, mountdata);
fs/nfs/nfs4proc.c +1 -1
@@ -758,7 +758,7 @@ static int _nfs4_proc_open(struct nfs4_o }nfs_confirm_seqid (&data->owner->so_seqid,0 );if (!(o_res->f_attr->valid &NFS_ATTR_FATTR )) -return server->rpc_ops->getattr (server, &o_res->fh, o_res->f_attr); +return server->nfs_client->rpc_ops->getattr (server, &o_res->fh, o_res->f_attr);return 0 ; }
fs/nfs/super.c +33 -26
153 lines not on this page · raw message
include/linux/nfs_fs.h +1 -1
@@ -209,7 +209,7 @@ #define NFS_SB(s) ((struct nfs_server *#define NFS_FH (inode) (&NFS_I(inode)->fh)#define NFS_SERVER (inode) (NFS_SB(inode->i_sb))#define NFS_CLIENT (inode) (NFS_SERVER(inode)->client) -#define NFS_PROTO (inode) (NFS_SERVER(inode)->rpc_ops) +#define NFS_PROTO (inode) (NFS_SERVER(inode)->nfs_client->rpc_ops)#define NFS_ADDR (inode) (RPC_PEERADDR(NFS_CLIENT(inode)))#define NFS_COOKIEVERF (inode) (NFS_I(inode)->cookieverf)#define NFS_READTIME (inode) (NFS_I(inode)->read_cache_jiffies)
include/linux/nfs_fs_sb.h +1 -1
@@ -25,6 +25,7 @@ #define NFS_CS_IDMAP 2 /* - idmap starstruct list_head cl_superblocks;/* List of nfs_server structs */ struct rpc_clnt * cl_rpcclient; +const struct nfs_rpc_ops *rpc_ops;/* NFS protocol vector */ #ifdef CONFIG_NFS_V4 u64 cl_clientid;/* constant */
@@ -74,7 +75,6 @@ struct nfs_server {struct rpc_clnt * client;/* RPC client handle */ struct rpc_clnt * client_sys;/* 2nd handle for FSINFO */ struct rpc_clnt * client_acl;/* ACL RPC client handle */ -const struct nfs_rpc_ops *rpc_ops;/* NFS protocol vector */ struct nfs_iostats * io_stats;/* I/O statistics */ struct backing_dev_info backing_dev_info;int flags;/* various flags */
David Howells
maintainerPATCH 16/30 NFS: Eliminate client_sys in favour of cl_rpcclient [try #11]
In reply to David HowellsEliminate nfs_server::client_sys in favour of nfs_client::cl_rpcclient as we only really need one per server that we're talking to since it doesn't have any security on it.
The retransmission management variables are also moved to the common struct as they're required to set up the cl_rpcclient connection.
The NFS2/3 client and client_acl connections are thenceforth derived by cloning the cl_rpcclient connection and post-applying the authorisation flavour.
The code for setting up the initial common connection has been moved to client.c as nfs_create_rpc_client(). All the NFS program definition tables are also moved there as that's where they're now required rather than super.c.
---
fs/nfs/client.c | 119 ++++++++++++++++++++++++ fs/nfs/internal.h | 2 fs/nfs/nfs3proc.c | 6 + fs/nfs/proc.c | 4 - fs/nfs/super.c | 222 ++++++++++----------------------------------- include/linux/nfs_fs_sb.h | 5 - 6 files changed, 179 insertions(+), 179 deletions(-)
fs/nfs/client.c +119 -0
@@ -51,6 +51,48 @@ static LIST_HEAD(nfs_client_list);static DECLARE_WAIT_QUEUE_HEAD (nfs_client_active_wq);/* +* RPC cruft for NFS +*/ +static struct rpc_version *nfs_version[5 ] = { + [2 ] = &nfs_version2, +#ifdef CONFIG_NFS_V3 + [3 ] = &nfs_version3, +#endif +#ifdef CONFIG_NFS_V4 + [4 ] = &nfs_version4, +#endif +}; + +struct rpc_program nfs_program = { + .name ="nfs" , + .number =NFS_PROGRAM , + .nrvers =ARRAY_SIZE (nfs_version), + .version = nfs_version, + .stats = &nfs_rpcstat, + .pipe_dir_name ="/nfs" , +}; + +struct rpc_stat nfs_rpcstat = { + .program = &nfs_program +}; + + +#ifdef CONFIG_NFS_V3_ACL +static struct rpc_stat nfsacl_rpcstat = { &nfsacl_program }; +static struct rpc_version * nfsacl_version[] = { + [3 ] = &nfsacl_version3, +}; + +struct rpc_program nfsacl_program = { + .name ="nfsacl" , + .number =NFS_ACL_PROGRAM , + .nrvers =ARRAY_SIZE (nfsacl_version), + .version = nfsacl_version, + .stats = &nfsacl_rpcstat, +}; +#endif /* CONFIG_NFS_V3_ACL */ + +/* * Allocate a shared client record * * Since these are allocated/deallocated very rarely, we don't
@@ -310,3 +352,80 @@ void nfs_mark_client_ready(struct nfs_cl clp->cl_cons_state = state;wake_up_all (&nfs_client_active_wq); } + +/* +* Initialise the timeout values for a connection +*/ +static void nfs_init_timeout_values (struct rpc_timeout *to,int proto, +unsigned int timeo,unsigned int retrans) +{ + to->to_initval = timeo *HZ /10 ; + to->to_retries = retrans; +if (!to->to_retries) + to->to_retries =2 ; + +switch (proto) { +case IPPROTO_TCP : +if (!to->to_initval) + to->to_initval =60 *HZ ; +if (to->to_initval >NFS_MAX_TCP_TIMEOUT ) + to->to_initval =NFS_MAX_TCP_TIMEOUT ; + to->to_increment = to->to_initval; + to->to_maxval = to->to_initval + (to->to_increment * to->to_retries); + to->to_exponential =0 ; +break ; +case IPPROTO_UDP : +default : +if (!to->to_initval) + to->to_initval =11 *HZ /10 ; +if (to->to_initval >NFS_MAX_UDP_TIMEOUT ) + to->to_initval =NFS_MAX_UDP_TIMEOUT ; + to->to_maxval =NFS_MAX_UDP_TIMEOUT ; + to->to_exponential =1 ; +break ; + } +} + +/* +* Create an RPC client handle +*/ +int nfs_create_rpc_client (struct nfs_client *clp,int proto, +unsigned int timeo, +unsigned int retrans, +rpc_authflavor_t flavor) +{ +struct rpc_timeout timeparms; +struct rpc_xprt *xprt =NULL ; +struct rpc_clnt *clnt =NULL ; + +if (!IS_ERR (clp->cl_rpcclient)) +return 0 ; + +nfs_init_timeout_values (&timeparms, proto, timeo, retrans); + clp->retrans_timeo = timeparms.to_initval; + clp->retrans_count = timeparms.to_retries; + +/* create transport and client */ + xprt =xprt_create_proto (proto, &clp->cl_addr, &timeparms); +if (IS_ERR (xprt)) { +dprintk ("%s: cannot create RPC transport. Error = %ld\n" , + __FUNCTION__,PTR_ERR (xprt)); +return PTR_ERR (xprt); + } + +/* Bind to a reserved port! */ + xprt->resvport =1 ; +/* Create the client RPC handle */ + clnt =rpc_create_client (xprt, clp->cl_hostname, &nfs_program, + clp->rpc_ops->version,RPC_AUTH_UNIX ); +if (IS_ERR (clnt)) { +dprintk ("%s: cannot create RPC client. Error = %ld\n" , + __FUNCTION__,PTR_ERR (clnt)); +return PTR_ERR (clnt); + } + + clnt->cl_intr =1 ; + clnt->cl_softrtry =1 ; + clp->cl_rpcclient = clnt; +return 0 ; +}
fs/nfs/internal.h +2 -0
@@ -20,6 +20,8 @@ extern void nfs_put_client(struct nfs_clextern struct nfs_client *nfs_find_client (const struct sockaddr_in *,int );extern struct nfs_client *nfs_get_client (const char *,const struct sockaddr_in *,int );extern void nfs_mark_client_ready (struct nfs_client *,int ); +extern int nfs_create_rpc_client (struct nfs_client *,int ,unsigned int , +unsigned int ,rpc_authflavor_t );/* nfs4namespace.c */ #ifdef CONFIG_NFS_V4
fs/nfs/nfs3proc.c +3 -3
@@ -90,8 +90,8 @@ nfs3_proc_get_root(struct nfs_server *seint status; status =do_proc_get_root (server->client, fhandle, info); -if (status && server->client_sys != server->client) - status =do_proc_get_root (server->client_sys, fhandle, info); +if (status && server->nfs_client->cl_rpcclient != server->client) + status =do_proc_get_root (server->nfs_client->cl_rpcclient, fhandle, info);return status; }
@@ -785,7 +785,7 @@ nfs3_proc_fsinfo(struct nfs_server *servdprintk ("NFS call fsinfo\n" );nfs_fattr_init (info->fattr); - status =rpc_call_sync (server->client_sys, &msg,0 ); + status =rpc_call_sync (server->nfs_client->cl_rpcclient, &msg,0 );dprintk ("NFS reply fsinfo: %d\n" , status);return status; }
fs/nfs/proc.c +2 -2
@@ -66,14 +66,14 @@ nfs_proc_get_root(struct nfs_server *serdprintk ("%s: call getattr\n" , __FUNCTION__);nfs_fattr_init (fattr); - status =rpc_call_sync (server->client_sys, &msg,0 ); + status =rpc_call_sync (server->nfs_client->cl_rpcclient, &msg,0 );dprintk ("%s: reply getattr: %d\n" , __FUNCTION__, status);if (status)return status;dprintk ("%s: call statfs\n" , __FUNCTION__); msg.rpc_proc = &nfs_procedures[NFSPROC_STATFS ]; msg.rpc_resp = &fsinfo; - status =rpc_call_sync (server->client_sys, &msg,0 ); + status =rpc_call_sync (server->nfs_client->cl_rpcclient, &msg,0 );dprintk ("%s: reply statfs: %d\n" , __FUNCTION__, status);if (status)return status;
fs/nfs/super.c +51 -171
357 lines not on this page · raw message
include/linux/nfs_fs_sb.h +2 -3
@@ -26,6 +26,8 @@ #define NFS_CS_IDMAP 2 /* - idmap starstruct rpc_clnt * cl_rpcclient;const struct nfs_rpc_ops *rpc_ops;/* NFS protocol vector */ +unsigned long retrans_timeo;/* retransmit timeout */ +unsigned int retrans_count;/* number of retransmit tries */ #ifdef CONFIG_NFS_V4 u64 cl_clientid;/* constant */
@@ -73,7 +75,6 @@ #endifstruct nfs_server {struct nfs_client * nfs_client;/* shared client and NFS4 state */ struct rpc_clnt * client;/* RPC client handle */ -struct rpc_clnt * client_sys;/* 2nd handle for FSINFO */ struct rpc_clnt * client_acl;/* ACL RPC client handle */ struct nfs_iostats * io_stats;/* I/O statistics */ struct backing_dev_info backing_dev_info;
@@ -90,8 +91,6 @@ struct nfs_server {unsigned int acregmax;unsigned int acdirmin;unsigned int acdirmax; -unsigned long retrans_timeo;/* retransmit timeout */ -unsigned int retrans_count;/* number of retransmit tries */ unsigned int namelen;char * hostname;/* remote hostname */ struct nfs_fh fh;
David Howells
maintainerPATCH 17/30 NFS: Start rpciod in server common management [try #11]
In reply to David HowellsStart rpciod in the server common (nfs_client struct) management code rather than in the superblock management code. This means we only need to "start" it once per server instead of once per superblock.
---
fs/nfs/super.c | 31 ++++++------------------------- 1 files changed, 6 insertions(+), 25 deletions(-)
fs/nfs/super.c +6 -25
@@ -717,18 +717,15 @@ static int nfs_clone_generic_sb(struct nif (server->hostname ==NULL ) goto free_server;memcpy (server->hostname, hostname, len); - error =rpciod_up (); -if (error !=0 ) - goto free_hostname; sb =fill_sb (server, data);if (IS_ERR (sb)) { error =PTR_ERR (sb); - goto kill_rpciod; + goto free_hostname; }if (sb->s_root) - goto out_rpciod_down; + goto out_share; server =fill_server (sb, data);if (IS_ERR (server)) {
@@ -740,14 +737,11 @@ out_deactivate:up_write (&sb->s_umount);deactivate_super (sb);return error; -out_rpciod_down: -rpciod_down (); +out_share:kfree (server->hostname);nfs_put_client (server->nfs_client);kfree (server);return simple_set_mnt (mnt, sb); -kill_rpciod: -rpciod_down (); free_hostname:kfree (server->hostname); free_server:
@@ -934,22 +928,14 @@ #endif /* CONFIG_NFS_V3 */ goto out_err; } -/* Fire up rpciod if not yet running */ - error =rpciod_up (); -if (error <0 ) { -dprintk ("%s: couldn't start rpciod! Error = %d\n" , - __FUNCTION__, error); - goto out_err; - } - s =sget (fs_type, nfs_compare_super, nfs_set_super, server);if (IS_ERR (s)) { error =PTR_ERR (s); - goto out_err_rpciod; + goto out_err; }if (s->s_root) - goto out_rpciod_down; + goto out_share; s->s_flags = flags;
@@ -962,13 +948,10 @@ #endif /* CONFIG_NFS_V3 */ s->s_flags |=MS_ACTIVE ;return simple_set_mnt (mnt, s); -out_rpciod_down: -rpciod_down (); +out_share:kfree (server);return simple_set_mnt (mnt, s); -out_err_rpciod: -rpciod_down (); out_err:kfree (server); out_err_noserver:
@@ -989,8 +972,6 @@ static void nfs_kill_super(struct super_if (!(server->flags &NFS_MOUNT_NONLM ))lockd_down ();/* release rpc.lockd */ -rpciod_down ();/* release rpciod */ -nfs_free_iostats (server->io_stats);kfree (server->hostname);nfs_put_client (server->nfs_client);
David Howells
maintainerPATCH 18/30 NFS: Share NFS superblocks per-protocol per-server per-FSID [try #11]
In reply to David HowellsThe attached patch makes NFS share superblocks between mounts from the same server and FSID over the same protocol.
It does this by creating each superblock with a false root and returning the real root dentry in the vfsmount presented by get_sb(). The root dentry set starts off as an anonymous dentry if we don't already have the dentry for its inode, otherwise it simply returns the dentry we already have.
We may thus end up with several trees of dentries in the superblock, and if at some later point one of anonymous tree roots is discovered by normal filesystem activity to be located in another tree within the superblock, the anonymous root is named and materialises attached to the second tree at the appropriate point.
Why do it this way? Why not pass an extra argument to the mount() syscall to indicate the subpath and then pathwalk from the server root to the desired directory? You can't guarantee this will work for two reasons:
(1) The root and intervening nodes may not be accessible to the client.
With NFS2 and NFS3, for instance, mountd is called on the server to get the filehandle for the tip of a path. mountd won't give us handles for anything we don't have permission to access, and so we can't set up NFS inodes for such nodes, and so can't easily set up dentries (we'd have to have ghost inodes or something).
With this patch we don't actually create dentries until we get handles from the server that we can use to set up their inodes, and we don't actually bind them into the tree until we know for sure where they go.
(2) Inaccessible symbolic links.
If we're asked to mount two exports from the server, eg:
mount warthog:/warthog/aaa/xxx /mmm
mount warthog:/warthog/bbb/yyy /nnn
We may not be able to access anything nearer the root than xxx and yyy, but we may find out later that /mmm/www/yyy, say, is actually the same directory as the one mounted on /nnn. What we might then find out, for example, is that /warthog/bbb was actually a symbolic link to /warthog/aaa/xxx/www, but we can't actually determine that by talking to the server until /warthog is made available by NFS.
This would lead to having constructed an errneous dentry tree which we can't easily fix. We can end up with a dentry marked as a directory when it should actually be a symlink, or we could end up with an apparently hardlinked directory.
With this patch we need not make assumptions about the type of a dentry for which we can't retrieve information, nor need we assume we know its place in the grand scheme of things until we actually see that place.
This patch reduces the possibility of aliasing in the inode and page caches for inodes that may be accessed by more than one NFS export. It also reduces the number of superblocks required for NFS where there are many NFS exports being used from a server (home directory server + autofs for example).
This in turn makes it simpler to do local caching of network filesystems, as it can then be guaranteed that there won't be links from multiple inodes in separate superblocks to the same cache file.
Obviously, cache aliasing between different levels of NFS protocol could still be a problem, but at least that gives us another key to use when indexing the cache.
This patch makes the following changes:
(1) The server record construction/destruction has been abstracted out into its own set of functions to make things easier to get right. These have been moved into fs/nfs/client.c.
All the code in fs/nfs/client.c has to do with the management of connections to servers, and doesn't touch superblocks in any way; the remaining code in fs/nfs/super.c has to do with VFS superblock management.
(2) The sequence of events undertaken by NFS mount is now reordered:
(a) A volume representation (struct nfs_server) is allocated.
(b) A server representation (struct nfs_client) is acquired. This may be allocated or shared, and is keyed on server address, port and NFS version.
(c) If allocated, the client representation is initialised. The state member variable of nfs_client is used to prevent a race during initialisation from two mounts.
(d) For NFS4 a simple pathwalk is performed, walking from FH to FH to find the root filehandle for the mount (fs/nfs/getroot.c). For NFS2/3 we are given the root FH in advance.
(e) The volume FSID is probed for on the root FH.
(f) The volume representation is initialised from the FSINFO record retrieved on the root FH.
(g) sget() is called to acquire a superblock. This may be allocated or shared, keyed on client pointer and FSID.
(h) If allocated, the superblock is initialised.
(i) If the superblock is shared, then the new nfs_server record is discarded.
(j) The root dentry for this mount is looked up from the root FH.
(k) The root dentry for this mount is assigned to the vfsmount.
(3) nfs_readdir_lookup() creates dentries for each of the entries readdir() returns; this function now attaches disconnected trees from alternate roots that happen to be discovered attached to a directory being read (in the same way nfs_lookup() is made to do for lookup ops).
The new d_materialise_unique() function is now used to do this, thus permitting the whole thing to be done under one set of locks, and thus avoiding any race between mount and lookup operations on the same directory.
(4) The client management code uses a new debug facility: NFSDBG_CLIENT which is set by echoing 1024 to /proc/net/sunrpc/nfs_debug.
(5) Clone mounts are now called xdev mounts.
(6) Use the dentry passed to the statfs() op as the handle for retrieving fs statistics rather than the root dentry of the superblock (which is now a dummy).
---
fs/nfs/Makefile | 2 fs/nfs/client.c | 735 +++++++++++++++++++++++++++ fs/nfs/dir.c | 16 - fs/nfs/getroot.c | 306 +++++++++++ fs/nfs/idmap.c | 3 fs/nfs/inode.c | 2 fs/nfs/internal.h | 82 ++- fs/nfs/namespace.c | 25 + fs/nfs/nfs3proc.c | 2 fs/nfs/nfs4_fs.h | 6 fs/nfs/nfs4namespace.c | 110 +++- fs/nfs/nfs4proc.c | 59 -- fs/nfs/nfs4renewd.c | 13 fs/nfs/nfs4state.c | 18 - fs/nfs/read.c | 2 fs/nfs/super.c | 1207 +++++++++++++++++---------------------------- fs/nfs/write.c | 2 include/linux/nfs_fs_sb.h | 21 - 18 files changed, 1655 insertions(+), 956 deletions(-)
fs/nfs/Makefile +1 -1
@@ -4,7 +4,7 @@ # obj-$(CONFIG_NFS_FS) += nfs.o -nfs-y := client.o dir.o file.o inode.o super.o nfs2xdr.o \ +nfs-y := client.o dir.o file.o getroot.o inode.o super.o nfs2xdr.o \ pagelist.o proc.o read.o symlink.o unlink.o \ write.o namespace.o nfs-$(CONFIG_ROOT_NFS) += nfsroot.o mount_clnt.o
fs/nfs/client.c +727 -8
768 lines not on this page · raw message
fs/nfs/dir.c +10 -6
@@ -31,6 +31,7 @@ #include <linux/nfs_mount.h>#include <linux/pagemap.h> #include <linux/smp_lock.h> #include <linux/namei.h> +#include <linux/mount.h> #include "nfs4_fs.h" #include "delegation.h"
@@ -870,14 +871,14 @@ int nfs_is_exclusive_create(struct inodereturn (nd->intent.open.flags &O_EXCL ) !=0 ; } -static inline int nfs_reval_fsid (struct inode *dir, -struct nfs_fh *fh,struct nfs_fattr *fattr) +static inline int nfs_reval_fsid (struct vfsmount *mnt,struct inode *dir, +struct nfs_fh *fh,struct nfs_fattr *fattr) {struct nfs_server *server =NFS_SERVER (dir);if (!nfs_fsid_equal (&server->fsid, &fattr->fsid))/* Revalidate fsid on root dir */ -return __nfs_revalidate_inode (server, dir->i_sb->s_root->d_inode); +return __nfs_revalidate_inode (server, mnt->mnt_root->d_inode);return 0 ; }
@@ -913,7 +914,7 @@ static struct dentry *nfs_lookup(struct res =ERR_PTR (error); goto out_unlock; } - error =nfs_reval_fsid (dir, &fhandle, &fattr); + error =nfs_reval_fsid (nd->mnt, dir, &fhandle, &fattr);if (error <0 ) { res =ERR_PTR (error); goto out_unlock;
@@ -922,8 +923,9 @@ static struct dentry *nfs_lookup(struct res = (struct dentry *)inode;if (IS_ERR (res)) goto out_unlock; + no_entry: - res =d_add_unique (dentry, inode); + res =d_materialise_unique (dentry, inode);if (res !=NULL ) dentry = res;nfs_renew_times (dentry);
@@ -1117,11 +1119,13 @@ static struct dentry *nfs_readdir_lookupdput (dentry);return NULL ; } - alias =d_add_unique (dentry, inode); + + alias =d_materialise_unique (dentry, inode);if (alias !=NULL ) {dput (dentry); dentry = alias; } +nfs_renew_times (dentry);nfs_set_verifier (dentry,nfs_save_change_attribute (dir));return dentry;
fs/nfs/getroot.c new file +306 -0
306 lines not on this page · raw message
fs/nfs/idmap.c +1 -2
@@ -114,8 +114,7 @@ nfs_idmap_new(struct nfs_client *clp)struct idmap *idmap;int error; -if (clp->cl_idmap !=NULL ) -return 0 ; +BUG_ON (clp->cl_idmap !=NULL );if ((idmap =kzalloc (sizeof (*idmap),GFP_KERNEL )) ==NULL )return -ENOMEM ;
fs/nfs/inode.c +1 -1
@@ -1025,7 +1025,7 @@ #endif out_fileid:printk (KERN_ERR "NFS: server %s error: fileid changed\n" "fsid %s: expected fileid 0x%Lx, got 0x%Lx\n" , -NFS_SERVER (inode)->hostname, inode->i_sb->s_id, +NFS_SERVER (inode)->nfs_client->cl_hostname, inode->i_sb->s_id, (long long )nfsi->fileid, (long long )fattr->fileid); goto out_err; }
fs/nfs/internal.h +46 -36
122 lines not on this page · raw message
fs/nfs/namespace.c +18 -7
@@ -2,6 +2,7 @@* linux/fs/nfs/namespace.c * * Copyright (C) 2005 Trond Myklebust <[email protected]> +* - Modified by David Howells <[email protected]> * * NFS namespace */
@@ -28,6 +29,7 @@ int nfs_mountpoint_expiry_timeout = 500/* * nfs_path - reconstruct the path given an arbitrary dentry * @base - arbitrary string to prepend to the path +* @droot - pointer to root dentry for mountpoint * @dentry - pointer to dentry * @buffer - result buffer * @buflen - length of buffer
@@ -38,7 +40,9 @@ int nfs_mountpoint_expiry_timeout = 500* This is mainly for use in figuring out the path on the * server side when automounting on top of an existing partition. */ -char *nfs_path (const char *base,const struct dentry *dentry, +char *nfs_path (const char *base, +const struct dentry *droot, +const struct dentry *dentry,char *buffer,ssize_t buflen) {char *end = buffer+buflen;
@@ -47,7 +51,7 @@ char *nfs_path(const char *base, const s *--end ='\0' ; buflen--;spin_lock (&dcache_lock); -while (!IS_ROOT (dentry)) { +while (!IS_ROOT (dentry) && dentry != droot) { namelen = dentry->d_name.len; buflen -= namelen +1 ;if (buflen <0 )
@@ -94,12 +98,13 @@ static void * nfs_follow_mountpoint(strustruct nfs_fattr fattr;int err; +dprintk ("--> nfs_follow_mountpoint()\n" ); +BUG_ON (IS_ROOT (dentry));dprintk ("%s: enter\n" , __FUNCTION__);dput (nd->dentry); nd->dentry =dget (dentry); -if (d_mountpoint (nd->dentry)) - goto out_follow; +/* Look it up again */ parent =dget_parent (nd->dentry); err = server->nfs_client->rpc_ops->lookup(parent->d_inode,
@@ -132,6 +137,8 @@ static void * nfs_follow_mountpoint(struschedule_delayed_work (&nfs_automount_task, nfs_mountpoint_expiry_timeout); out:dprintk ("%s: done, returned %d\n" , __FUNCTION__, err); + +dprintk ("<-- nfs_follow_mountpoint() = %d\n" , err);return ERR_PTR (err); out_err:path_release (nd);
@@ -181,14 +188,14 @@ #ifdef CONFIG_NFS_V4switch (server->nfs_client->cl_nfsversion) {case 2 :case 3 : - mnt =vfs_kern_mount (&clone_nfs_fs_type,0 , devname, mountdata); + mnt =vfs_kern_mount (&nfs_xdev_fs_type,0 , devname, mountdata);break ;case 4 : - mnt =vfs_kern_mount (&clone_nfs4_fs_type,0 , devname, mountdata); + mnt =vfs_kern_mount (&nfs4_xdev_fs_type,0 , devname, mountdata); }return mnt;#else -return vfs_kern_mount (&clone_nfs_fs_type,0 , devname, mountdata); +return vfs_kern_mount (&nfs_xdev_fs_type,0 , devname, mountdata);#endif }
@@ -214,6 +221,8 @@ struct vfsmount *nfs_do_submount(const schar *page = (char *)__get_free_page (GFP_USER );char *devname; +dprintk ("--> nfs_do_submount()\n" ); +dprintk ("%s: submounting on %s/%s\n" , __FUNCTION__, dentry->d_parent->d_name.name, dentry->d_name.name);
@@ -228,5 +237,7 @@ free_page:free_page ((unsigned long )page); out:dprintk ("%s: done\n" , __FUNCTION__); + +dprintk ("<-- nfs_do_submount() = %p\n" , mnt);return mnt; }
fs/nfs/nfs3proc.c +1 -1
@@ -81,7 +81,7 @@ do_proc_get_root(struct rpc_clnt *client }/* -* Bare-bones access to getattr: this is for nfs_read_super. +* Bare-bones access to getattr: this is for nfs_get_root/nfs_get_sb */ static int nfs3_proc_get_root(struct nfs_server *server, struct nfs_fh *fhandle,
fs/nfs/nfs4_fs.h +0 -6
@@ -188,8 +188,6 @@ extern void nfs4_kill_renewd(struct nfs_extern void nfs4_renew_state (void *);/* nfs4state.c */ -extern void init_nfsv4_state (struct nfs_server *); -extern void destroy_nfsv4_state (struct nfs_server *);struct rpc_cred *nfs4_get_renew_cred (struct nfs_client *clp);extern u32 nfs4_alloc_lockowner_id (struct nfs_client *);
@@ -224,10 +222,6 @@ extern struct svc_version nfs4_callback_#else -#define init_nfsv4_state (server) do { } while (0) -#define destroy_nfsv4_state (server) do { } while (0) -#define nfs4_put_state_owner (inode, owner) do { } while (0) -#define nfs4_put_open_state (state) do { } while (0)#define nfs4_close_state (a, b) do { } while (0)#endif /* CONFIG_NFS_V4 */
fs/nfs/nfs4namespace.c +85 -25
173 lines not on this page · raw message
fs/nfs/nfs4proc.c +4 -55
74 lines not on this page · raw message
fs/nfs/nfs4renewd.c +0 -13
@@ -127,26 +127,13 @@ nfs4_schedule_state_renewal(struct nfs_cvoid nfs4_renewd_prepare_shutdown (struct nfs_server *server) { -struct nfs_client *clp = server->nfs_client; - -if (!clp) -return ;flush_scheduled_work (); -down_write (&clp->cl_sem); -if (!list_empty (&server->nfs4_siblings)) -list_del_init (&server->nfs4_siblings); -up_write (&clp->cl_sem); } -/* Must be called with clp->cl_sem locked for writes */ void nfs4_kill_renewd (struct nfs_client *clp) {down_read (&clp->cl_sem); -if (!list_empty (&clp->cl_superblocks)) { -up_read (&clp->cl_sem); -return ; - }cancel_delayed_work (&clp->cl_renewd);up_read (&clp->cl_sem);flush_scheduled_work ();
fs/nfs/nfs4state.c +0 -18
@@ -58,24 +58,6 @@ const nfs4_stateid zero_stateid;static LIST_HEAD (nfs4_clientid_list); -void -init_nfsv4_state (struct nfs_server *server) -{ - server->nfs_client =NULL ; -INIT_LIST_HEAD (&server->nfs4_siblings); -} - -void -destroy_nfsv4_state (struct nfs_server *server) -{ -kfree (server->mnt_path); - server->mnt_path =NULL ; -if (server->nfs_client) { -nfs_put_client (server->nfs_client); - server->nfs_client =NULL ; - } -} -static int nfs4_init_client (struct nfs_client *clp,struct rpc_cred *cred) { int status = nfs4_proc_setclientid(clp, NFS4_CALLBACK,
fs/nfs/read.c +1 -1
@@ -162,7 +162,7 @@ static int nfs_readpage_sync(struct nfs_ rdata->args.offset =page_offset (page) + rdata->args.pgbase; dprintk("NFS: nfs_proc_read(%s, (%s/%Ld), %Lu, %u)\n", - NFS_SERVER(inode)->hostname, + NFS_SERVER(inode)->nfs_client->cl_hostname, inode->i_sb->s_id, (long long)NFS_FILEID(inode), (unsigned long long)rdata->args.pgbase,
fs/nfs/super.c +444 -763
1,305 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.
David Howells
maintainerPATCH 19/30 NFS: Add server and volume lists to /proc [try #11]
In reply to David HowellsMake two new proc files available:
/proc/fs/nfsfs/servers
/proc/fs/nfsfs/volumes
The first lists the servers with which we are currently dealing (struct nfs_client), and the second lists the volumes we have on those servers (struct nfs_server).
---
fs/nfs/client.c | 284 +++++++++++++++++++++++++++++++++++++++++++++++++++++ fs/nfs/inode.c | 7 + fs/nfs/internal.h | 12 ++ 3 files changed, 303 insertions(+), 0 deletions(-)
fs/nfs/client.c +284 -0
@@ -1148,3 +1148,287 @@ out_free_server:dprintk ("<-- nfs_clone_server() = error %d\n" , error);return ERR_PTR (error); } + +#ifdef CONFIG_PROC_FS +static struct proc_dir_entry *proc_fs_nfs; + +static int nfs_server_list_open (struct inode *inode,struct file *file); +static void *nfs_server_list_start (struct seq_file *p,loff_t *pos); +static void *nfs_server_list_next (struct seq_file *p,void *v,loff_t *pos); +static void nfs_server_list_stop (struct seq_file *p,void *v); +static int nfs_server_list_show (struct seq_file *m,void *v); + +static struct seq_operations nfs_server_list_ops = { + .start = nfs_server_list_start, + .next = nfs_server_list_next, + .stop = nfs_server_list_stop, + .show = nfs_server_list_show, +}; + +static struct file_operations nfs_server_list_fops = { + .open = nfs_server_list_open, + .read = seq_read, + .llseek = seq_lseek, + .release = seq_release, +}; + +static int nfs_volume_list_open (struct inode *inode,struct file *file); +static void *nfs_volume_list_start (struct seq_file *p,loff_t *pos); +static void *nfs_volume_list_next (struct seq_file *p,void *v,loff_t *pos); +static void nfs_volume_list_stop (struct seq_file *p,void *v); +static int nfs_volume_list_show (struct seq_file *m,void *v); + +static struct seq_operations nfs_volume_list_ops = { + .start = nfs_volume_list_start, + .next = nfs_volume_list_next, + .stop = nfs_volume_list_stop, + .show = nfs_volume_list_show, +}; + +static struct file_operations nfs_volume_list_fops = { + .open = nfs_volume_list_open, + .read = seq_read, + .llseek = seq_lseek, + .release = seq_release, +}; + +/* +* open "/proc/fs/nfsfs/servers" which provides a summary of servers with which +* we're dealing +*/ +static int nfs_server_list_open (struct inode *inode,struct file *file) +{ +struct seq_file *m; +int ret; + + ret =seq_open (file, &nfs_server_list_ops); +if (ret <0 ) +return ret; + + m = file->private_data; + m->private =PDE (inode)->data; + +return 0 ; +} + +/* +* set up the iterator to start reading from the server list and return the first item +*/ +static void *nfs_server_list_start (struct seq_file *m,loff_t *_pos) +{ +struct list_head *_p; +loff_t pos = *_pos; + +/* lock the list against modification */ +spin_lock (&nfs_client_lock); + +/* allow for the header line */ +if (!pos) +return SEQ_START_TOKEN ; + pos--; + +/* find the n'th element in the list */ +list_for_each (_p, &nfs_client_list) +if (!pos--) +break ; + +return _p != &nfs_client_list ? _p :NULL ; +} + +/* +* move to next server +*/ +static void *nfs_server_list_next (struct seq_file *p,void *v,loff_t *pos) +{ +struct list_head *_p; + + (*pos)++; + + _p = v; + _p = (v ==SEQ_START_TOKEN ) ? nfs_client_list.next : _p->next; + +return _p != &nfs_client_list ? _p :NULL ; +} + +/* +* clean up after reading from the transports list +*/ +static void nfs_server_list_stop (struct seq_file *p,void *v) +{ +spin_unlock (&nfs_client_lock); +} + +/* +* display a header line followed by a load of call lines +*/ +static int nfs_server_list_show (struct seq_file *m,void *v) +{ +struct nfs_client *clp; + +/* display header on line 1 */ +if (v ==SEQ_START_TOKEN ) { +seq_puts (m,"NV SERVER PORT USE HOSTNAME\n" ); +return 0 ; + } + +/* display one transport per line on subsequent lines */ + clp = list_entry(v, struct nfs_client, cl_share_link); + +seq_printf (m,"v%d %02x%02x%02x%02x %4hx %3d %s\n" , + clp->cl_nfsversion, +NIPQUAD (clp->cl_addr.sin_addr), +ntohs (clp->cl_addr.sin_port), +atomic_read (&clp->cl_count), + clp->cl_hostname); + +return 0 ; +} + +/* +* open "/proc/fs/nfsfs/volumes" which provides a summary of extant volumes +*/ +static int nfs_volume_list_open (struct inode *inode,struct file *file) +{ +struct seq_file *m; +int ret; + + ret =seq_open (file, &nfs_volume_list_ops); +if (ret <0 ) +return ret; + + m = file->private_data; + m->private =PDE (inode)->data; + +return 0 ; +} + +/* +* set up the iterator to start reading from the volume list and return the first item +*/ +static void *nfs_volume_list_start (struct seq_file *m,loff_t *_pos) +{ +struct list_head *_p; +loff_t pos = *_pos; + +/* lock the list against modification */ +spin_lock (&nfs_client_lock); + +/* allow for the header line */ +if (!pos) +return SEQ_START_TOKEN ; + pos--; + +/* find the n'th element in the list */ +list_for_each (_p, &nfs_volume_list) +if (!pos--) +break ; + +return _p != &nfs_volume_list ? _p :NULL ; +} + +/* +* move to next volume +*/ +static void *nfs_volume_list_next (struct seq_file *p,void *v,loff_t *pos) +{ +struct list_head *_p; + + (*pos)++; + + _p = v; + _p = (v ==SEQ_START_TOKEN ) ? nfs_volume_list.next : _p->next; + +return _p != &nfs_volume_list ? _p :NULL ; +} + +/* +* clean up after reading from the transports list +*/ +static void nfs_volume_list_stop (struct seq_file *p,void *v) +{ +spin_unlock (&nfs_client_lock); +} + +/* +* display a header line followed by a load of call lines +*/ +static int nfs_volume_list_show (struct seq_file *m,void *v) +{ +struct nfs_server *server; +struct nfs_client *clp; +char dev[8 ], fsid[17 ]; + +/* display header on line 1 */ +if (v ==SEQ_START_TOKEN ) { +seq_puts (m,"NV SERVER PORT DEV FSID\n" ); +return 0 ; + } +/* display one transport per line on subsequent lines */ + server = list_entry(v, struct nfs_server, master_link); + clp = server->nfs_client; + +snprintf (dev,8 ,"%u:%u" , +MAJOR (server->s_dev),MINOR (server->s_dev)); + +snprintf (fsid,17 ,"%llx:%llx" , + server->fsid.major, server->fsid.minor); + +seq_printf (m,"v%d %02x%02x%02x%02x %4hx %-7s %-17s\n" , + clp->cl_nfsversion, +NIPQUAD (clp->cl_addr.sin_addr), +ntohs (clp->cl_addr.sin_port), + dev, + fsid); + +return 0 ; +} + +/* +* initialise the /proc/fs/nfsfs/ directory +*/ +int __init nfs_fs_proc_init (void ) +{ +struct proc_dir_entry *p; + + proc_fs_nfs =proc_mkdir ("nfsfs" , proc_root_fs); +if (!proc_fs_nfs) + goto error_0; + + proc_fs_nfs->owner =THIS_MODULE ; + +/* a file of servers with which we're dealing */ + p =create_proc_entry ("servers" ,S_IFREG |S_IRUGO , proc_fs_nfs); +if (!p) + goto error_1; + + p->proc_fops = &nfs_server_list_fops; + p->owner =THIS_MODULE ; + +/* a file of volumes that we have mounted */ + p =create_proc_entry ("volumes" ,S_IFREG |S_IRUGO , proc_fs_nfs); +if (!p) + goto error_2; + + p->proc_fops = &nfs_volume_list_fops; + p->owner =THIS_MODULE ; +return 0 ; + +error_2: +remove_proc_entry ("servers" , proc_fs_nfs); +error_1: +remove_proc_entry ("nfsfs" , proc_root_fs); +error_0: +return -ENOMEM ; +} + +/* +* clean up the /proc/fs/nfsfs/ directory +*/ +void nfs_fs_proc_exit (void ) +{ +remove_proc_entry ("volumes" , proc_fs_nfs); +remove_proc_entry ("servers" , proc_fs_nfs); +remove_proc_entry ("nfsfs" , proc_root_fs); +} + +#endif /* CONFIG_PROC_FS */
fs/nfs/inode.c +7 -0
@@ -1144,6 +1144,10 @@ static int __init init_nfs_fs(void) {int err; + err =nfs_fs_proc_init (); +if (err) + goto out5; + err =nfs_init_nfspagecache ();if (err) goto out4;
@@ -1184,6 +1188,8 @@ out2: out3:nfs_destroy_nfspagecache (); out4: +nfs_fs_proc_exit (); +out5:return err; }
@@ -1198,6 +1204,7 @@ #ifdef CONFIG_PROC_FSrpc_proc_unregister ("nfs" );#endif unregister_nfs_fs (); +nfs_fs_proc_exit (); }/* Not quite true; I just maintain it */
fs/nfs/internal.h +12 -0
@@ -47,6 +47,18 @@ extern void nfs_free_server(struct nfs_sextern struct nfs_server *nfs_clone_server (struct nfs_server *,struct nfs_fh *,struct nfs_fattr *); +#ifdef CONFIG_PROC_FS +extern int __init nfs_fs_proc_init (void ); +extern void nfs_fs_proc_exit (void ); +#else +static inline int nfs_fs_proc_init (void ) +{ +return 0 ; +} +static inline void nfs_fs_proc_exit (void ) +{ +} +#endif /* nfs4namespace.c */ #ifdef CONFIG_NFS_V4
David Howells
maintainerPATCH 20/30 NFS: Fix error handling [try #11]
In reply to David HowellsFix an error handling problem: nfs_put_client() can be given a NULL pointer if nfs_free_server() is asked to destroy a partially initialised record.
---
fs/nfs/client.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)
fs/nfs/client.c +3 -0
@@ -208,6 +208,9 @@ #endif*/ void nfs_put_client (struct nfs_client *clp) { +if (!clp) +return ; +dprintk ("--> nfs_put_client({%d})\n" ,atomic_read (&clp->cl_count));if (atomic_dec_and_lock (&clp->cl_count, &nfs_client_lock)) {
David Howells
maintainerPATCH 21/30 NFS: Secure the roots of the NFS subtrees in a shared superblock [try #11]
In reply to David HowellsInvoke security_d_instantiate() on root dentries after allocating them with dentry_alloc_anon(). Normally dentry_alloc_root() would do that, but we don't call that as we don't want to assign a name to the root dentry at this point (we may discover the real name later).
---
fs/nfs/getroot.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-)
fs/nfs/getroot.c +5 -0
@@ -33,6 +33,7 @@ #include <linux/nfs_idmap.h>#include <linux/vfs.h> #include <linux/namei.h> #include <linux/namespace.h> +#include <linux/security.h> #include <asm/system.h> #include <asm/uaccess.h>
@@ -109,6 +110,8 @@ struct dentry *nfs_get_root(struct superreturn ERR_PTR (-ENOMEM ); } +security_d_instantiate (mntroot, inode); +if (!mntroot->d_op) mntroot->d_op = server->nfs_client->rpc_ops->dentry_ops;
@@ -296,6 +299,8 @@ struct dentry *nfs4_get_root(struct supereturn ERR_PTR (-ENOMEM ); } +security_d_instantiate (mntroot, inode); +if (!mntroot->d_op) mntroot->d_op = server->nfs_client->rpc_ops->dentry_ops;
David Howells
maintainerPATCH 22/30 FS-Cache: Provide a filesystem-specific sync'able page bit [try #11]
In reply to David HowellsThe attached patch provides a filesystem-specific page bit that a filesystem can synchronise upon. This can be used, for example, by a netfs to synchronise with CacheFS writing its pages to disk.
The PG_checked bit is replaced with PG_fs_misc, and various operations are provided based upon that. The *PageChecked() macros still exist, though now they just convert to *PageFsMisc() macros. The name of the "checked" macros seems appropriate as they're used for metadata page validation by various filesystems.
---
fs/afs/dir.c | 5 +---- fs/ext2/dir.c | 6 +++--- fs/ext3/inode.c | 10 +++++----- fs/freevxfs/vxfs_subr.c | 2 +- fs/reiserfs/inode.c | 10 +++++----- fs/ufs/dir.c | 6 +++--- include/linux/page-flags.h | 15 ++++++++++----- include/linux/pagemap.h | 11 +++++++++++ mm/filemap.c | 17 +++++++++++++++++ mm/migrate.c | 4 ++-- mm/page_alloc.c | 2 +- 11 files changed, 59 insertions(+), 29 deletions(-)
fs/afs/dir.c +1 -4
@@ -155,11 +155,9 @@ #endif } } -SetPageChecked (page);return ; error: -SetPageChecked (page);SetPageError (page); }/* end afs_dir_check_page() */
@@ -191,8 +189,7 @@ static struct page *afs_dir_get_page(strkmap (page);if (!PageUptodate (page)) goto fail; -if (!PageChecked (page)) -afs_dir_check_page (dir, page); +afs_dir_check_page (dir, page);if (PageError (page)) goto fail; }
fs/ext2/dir.c +3 -3
@@ -112,7 +112,7 @@ static void ext2_check_page(struct pageif (offs != limit) goto Eend; out: -SetPageChecked (page); +SetPageFsMisc (page);return ;/* Too bad, we had an error */
@@ -152,7 +152,7 @@ Eend: dir->i_ino, (page->index<<PAGE_CACHE_SHIFT )+offs, (unsigned long) le32_to_cpu(p->inode)); fail: -SetPageChecked (page); +SetPageFsMisc (page);SetPageError (page); }
@@ -165,7 +165,7 @@ static struct page * ext2_get_page(struckmap (page);if (!PageUptodate (page)) goto fail; -if (!PageChecked (page)) +if (!PageFsMisc (page))ext2_check_page (page);if (PageError (page)) goto fail;
fs/ext3/inode.c +5 -5
@@ -1527,12 +1527,12 @@ static int ext3_journalled_writepage(str goto no_write; } -if (!page_has_buffers (page) ||PageChecked (page)) { +if (!page_has_buffers (page) ||PageFsMisc (page)) {/* * It's mmapped pagecache. Add buffers and journal it. There * doesn't seem much point in redirtying the page here. */ -ClearPageChecked (page); +ClearPageFsMisc (page); ret =block_prepare_write (page,0 ,PAGE_CACHE_SIZE , ext3_get_block);if (ret !=0 ) {
@@ -1589,7 +1589,7 @@ static void ext3_invalidatepage(struct p* If it's a full truncate we just forget about the pending dirtying */ if (offset ==0 ) -ClearPageChecked (page); +ClearPageFsMisc (page);journal_invalidatepage (journal, page, offset); }
@@ -1598,7 +1598,7 @@ static int ext3_releasepage(struct page {journal_t *journal =EXT3_JOURNAL (page->mapping->host); -WARN_ON (PageChecked (page)); +WARN_ON (PageFsMisc (page));if (!page_has_buffers (page))return 0 ;return journal_try_to_free_buffers (journal, page, wait);
@@ -1694,7 +1694,7 @@ out:*/ static int ext3_journalled_set_page_dirty (struct page *page) { -SetPageChecked (page); +SetPageFsMisc (page);return __set_page_dirty_nobuffers (page); }
fs/freevxfs/vxfs_subr.c +1 -1
@@ -78,7 +78,7 @@ vxfs_get_page(struct address_space *mappkmap (pp);if (!PageUptodate (pp)) goto fail; -/** if (!PageChecked(pp)) **/ +/** if (!PageFsMisc(pp)) **/ /** vxfs_check_page(pp); **/ if (PageError (pp)) goto fail;
fs/reiserfs/inode.c +5 -5
@@ -2351,7 +2351,7 @@ static int reiserfs_write_full_page(strustruct buffer_head *head, *bh;int partial =0 ;int nr =0 ; -int checked =PageChecked (page); +int checked =PageFsMisc (page);struct reiserfs_transaction_handle th;struct super_block *s = inode->i_sb;int bh_per_page =PAGE_CACHE_SIZE / s->s_blocksize;
@@ -2420,7 +2420,7 @@ static int reiserfs_write_full_page(stru* blocks we're going to log */ if (checked) { -ClearPageChecked (page); +ClearPageFsMisc (page);reiserfs_write_lock (s); error =journal_begin (&th, s, bh_per_page +1 );if (error) {
@@ -2801,7 +2801,7 @@ static void reiserfs_invalidatepage(struBUG_ON (!PageLocked (page));if (offset ==0 ) -ClearPageChecked (page); +ClearPageFsMisc (page);if (!page_has_buffers (page)) goto out;
@@ -2842,7 +2842,7 @@ static int reiserfs_set_page_dirty(struc {struct inode *inode = page->mapping->host;if (reiserfs_file_data_log (inode)) { -SetPageChecked (page); +SetPageFsMisc (page);return __set_page_dirty_nobuffers (page); }return __set_page_dirty_buffers (page);
@@ -2865,7 +2865,7 @@ static int reiserfs_releasepage(struct pstruct buffer_head *bh;int ret =1 ; -WARN_ON (PageChecked (page)); +WARN_ON (PageFsMisc (page));spin_lock (&j->j_dirty_buffers_lock); head =page_buffers (page); bh = head;
fs/ufs/dir.c +3 -3
@@ -135,7 +135,7 @@ static void ufs_check_page(struct page *if (offs != limit) goto Eend; out: -SetPageChecked (page); +SetPageFsMisc (page);return ;/* Too bad, we had an error */
@@ -173,7 +173,7 @@ Eend:"offset=%lu" , dir->i_ino, (page->index<<PAGE_CACHE_SHIFT)+offs); fail: -SetPageChecked (page); +SetPageFsMisc (page);SetPageError (page); }
@@ -187,7 +187,7 @@ static struct page *ufs_get_page(structkmap (page);if (!PageUptodate (page)) goto fail; -if (!PageChecked (page)) +if (!PageFsMisc (page))ufs_check_page (page);if (PageError (page)) goto fail;
include/linux/page-flags.h +10 -5
@@ -71,7 +71,7 @@ #define PG_lru 5#define PG_active 6#define PG_slab 7/* slab debug (Suparna wants this) */ -#define PG_checked 8/* kill me in 2.5.<early>. */ +#define PG_fs_misc 8#define PG_arch_1 9#define PG_reserved 10#define PG_private 11/* Has something at ->private */
@@ -161,10 +161,6 @@ #else#define PageHighMem (page) 0/* needed to optimize away at compile time */ #endif -#define PageChecked (page) test_bit(PG_checked, &(page)->flags) -#define SetPageChecked (page) set_bit(PG_checked, &(page)->flags) -#define ClearPageChecked (page) clear_bit(PG_checked, &(page)->flags) -#define PageReserved (page) test_bit(PG_reserved, &(page)->flags)#define SetPageReserved (page) set_bit(PG_reserved, &(page)->flags)#define ClearPageReserved (page) clear_bit(PG_reserved, &(page)->flags)
@@ -263,4 +259,13 @@ static inline void set_page_writeback(st test_set_page_writeback(page); } +/* +* Filesystem-specific page bit testing +*/ +#define PageFsMisc (page) test_bit(PG_fs_misc, &(page)->flags) +#define SetPageFsMisc (page) set_bit(PG_fs_misc, &(page)->flags) +#define TestSetPageFsMisc (page) test_and_set_bit(PG_fs_misc, &(page)->flags) +#define ClearPageFsMisc (page) clear_bit(PG_fs_misc, &(page)->flags) +#define TestClearPageFsMisc (page) test_and_clear_bit(PG_fs_misc, &(page)->flags) +#endif /* PAGE_FLAGS_H */
include/linux/pagemap.h +11 -0
@@ -170,6 +170,17 @@ static inline void wait_on_page_writebacextern void end_page_writeback (struct page *page);/* +* Wait for filesystem-specific page synchronisation to complete +*/ +static inline void wait_on_page_fs_misc (struct page *page) +{ +if (PageFsMisc (page)) +wait_on_page_bit (page, PG_fs_misc); +} + +extern void fastcall end_page_fs_misc(struct page *page); + +/* * Fault a userspace page into pagetables. Return non-zero on a fault. * * This assumes that two userspace pages are always sufficient. That's
mm/filemap.c +17 -0
@@ -577,6 +577,23 @@ void fastcall __lock_page(struct page *p }EXPORT_SYMBOL (__lock_page); +/* +* Note completion of filesystem specific page synchronisation +* +* This is used to allow a page to be written to a filesystem cache in the +* background without holding up the completion of readpage +*/ +void fastcall end_page_fs_misc(struct page *page) +{ +smp_mb__before_clear_bit (); +if (!TestClearPageFsMisc (page)) +BUG (); +smp_mb__after_clear_bit (); +__wake_up_bit (page_waitqueue (page), &page->flags, PG_fs_misc); +} + +EXPORT_SYMBOL (end_page_fs_misc); +/** * find_get_page - find and get a page reference * @mapping: the address_space to search
mm/migrate.c +2 -2
@@ -348,8 +348,8 @@ static void migrate_page_copy(struct pagSetPageUptodate (newpage);if (PageActive (page))SetPageActive (newpage); -if (PageChecked (page)) -SetPageChecked (newpage); +if (PageFsMisc (page)) +SetPageFsMisc (newpage);if (PageMappedToDisk (page))SetPageMappedToDisk (newpage);
mm/page_alloc.c +1 -1
@@ -550,7 +550,7 @@ static int prep_new_page(struct page *pa page->flags &= ~(1 << PG_uptodate |1 << PG_error |1 << PG_referenced |1 << PG_arch_1 | -1 << PG_checked |1 << PG_mappedtodisk); +1 << PG_fs_misc |1 << PG_mappedtodisk);set_page_private (page,0 );set_page_refcounted (page);kernel_map_pages (page,1 << order,1 );
David Howells
maintainerPATCH 23/30 FS-Cache: Generic filesystem caching facility [try #11]
In reply to David HowellsThe attached patch adds a generic intermediary (FS-Cache) by which filesystems may call on local caching capabilities, and by which local caching backends may make caches available:
+---------+ | | +--------------+ | NFS |--+ | | | | | +-->| CacheFS | +---------+ | +----------+ | | /dev/hda5 | | | | | +--------------+ +---------+ +-->| | | | | | |--+ | AFS |----->| FS-Cache | | | | |--+ +---------+ +-->| | | | | | | +--------------+ +---------+ | +----------+ | | | | | | +-->| CacheFiles | | ISOFS |--+ | /var/cache | | | +--------------+ +---------+
The patch also documents the netfs interface and the cache backend interface provided by the facility.
There are a number of reasons why I'm not using i_mapping to do this. These have been discussed a lot on the LKML and CacheFS mailing lists, but to summarise the basics:
(1) Most filesystems don't do hole reportage. Holes in files are treated as blocks of zeros and can't be distinguished otherwise, making it difficult to distinguish blocks that have been read from the network and cached from those that haven't.
(2) The backing inode must be fully populated before being exposed to userspace through the main inode because the VM/VFS goes directly to the backing inode and does not interrogate the front inode on VM ops.
Therefore:
(a) The backing inode must fit entirely within the cache.
(b) All backed files currently open must fit entirely within the cache at the same time.
(c) A working set of files in total larger than the cache may not be cached.
(d) A file may not grow larger than the available space in the cache.
(e) A file that's open and cached, and remotely grows larger than the cache is potentially stuffed.
(3) Writes go to the backing filesystem, and can only be transferred to the network when the file is closed.
(4) There's no record of what changes have been made, so the whole file must be written back.
(5) The pages belong to the backing filesystem, and all metadata associated with that page are relevant only to the backing filesystem, and not anything stacked atop it.
The attached patch adds a generic core to which both networking filesystems and caches may bind. It transfers requests from networking filesystems to appropriate caches if possible, or else gracefully denies them.
If this facility is disabled in the kernel configuration, then all its operations will be trivially reducible to nothing by the compiler.
FS-Cache provides the following facilities:
(1) Caches can be added / removed at any time, even whilst in use.
(2) Adds a facility by which tags can be used to refer to caches, even if they're not mounted yet.
(3) More than one cache can be used at once. Caches can be selected explicitly by use of tags.
(4) The netfs is provided with an interface that allows either party to withdraw caching facilities from a file (required for (1)).
(5) A netfs may annotate cache objects that belongs to it.
(6) Cache objects can be pinned and reservations made.
(7) The interface to the netfs returns as few errors as possible, preferring rather to let the netfs remain oblivious.
(8) Cookies are used to represent indices, files and other objects to the netfs. The simplest cookie is just a NULL pointer - indicating nothing cached there.
(9) The netfs is allowed to propose - dynamically - any index hierarchy it desires, though it must be aware that the index search function is recursive, stack space is limited, and indices can only be children of indices.
(10) Indices can be used to group files together to reduce key size and to make group invalidation easier. The use of indices may make lookup quicker, but that's cache dependent.
(11) Data I/O is effectively done directly to and from the netfs's pages. The netfs indicates that page A is at index B of the data-file represented by cookie C, and that it should be read or written. The cache backend may or may not start I/O on that page, but if it does, a netfs callback will be invoked to indicate completion. The I/O may be either synchronous or asynchronous.
(12) Cookies can be "retired" upon release. At this point FS-Cache will mark them as obsolete and the index hierarchy rooted at that point will get recycled.
(13) The netfs provides a "match" function for index searches. In addition to saying whether a match was made or not, this can also specify that an entry should be updated or deleted.
FS-Cache maintains a virtual indexing tree in which all indices, files, objects and pages are kept. Bits of this tree may actually reside in one or more caches.
FSDEF
|
+------------------------------------+
| |
NFS AFS
| |
+--------------------------+ +-----------+
| | | |
homedir mirror afs.org redhat.com
| | |
+------------+ +---------------+ +----------+
| | | | | |
00001 00002 00007 00125 vol00001 vol00002
| | | | |
+---+---+ +-----+ +---+ +------+------+ +-----+----+
| | | | | | | | | | | | |
PG0 PG1 PG2 PG0 XATTR PG0 PG1 DIRENT DIRENT DIRENT R/W R/O Bak
| |
PG0 +-------+
| |
00001 00003
|
+---+---+
| | |
PG0 PG1 PG2In the example above, you can see two netfs's being backed: NFS and AFS. These have different index hierarchies:
(*) The NFS primary index will probably contain per-server indices. Each
server index is indexed by NFS file handles to get data file objects. Each data file objects can have an array of pages, but may also have further child objects, such as extended attributes and directory entries. Extended attribute objects themselves have page-array contents.
(*) The AFS primary index contains per-cell indices. Each cell index contains
per-logical-volume indices. Each of volume index contains up to three indices for the read-write, read-only and backup mirrors of those volumes. Each of these contains vnode data file objects, each of which contains an array of pages.
The very top index is the FS-Cache master index in which individual netfs's have entries.
Any index object may reside in more than one cache, provided it only has index children. Any index with non-index object children will be assumed to only reside in one cache.
The FS-Cache overview can be found in:
Documentation/filesystems/caching/fscache.txt
The netfs API to FS-Cache can be found in:
Documentation/filesystems/caching/netfs-api.txt
The cache backend API to FS-Cache can be found in:
Documentation/filesystems/caching/backend-api.txt
Further changes [try #11] that have been made:
(*) FSCACHE_NEGATIVE_COOKIE has been removed. NULL should be used instead.
(*) Add read/write context maintenance for in case the cache operation fails.
---
Documentation/filesystems/caching/backend-api.txt | 357 +++++++ Documentation/filesystems/caching/fscache.txt | 151 +++ Documentation/filesystems/caching/netfs-api.txt | 752 +++++++++++++++ fs/Kconfig | 15 fs/Makefile | 1 fs/fscache/Makefile | 11 fs/fscache/cookie.c | 1045 +++++++++++++++++++++ fs/fscache/fscache-int.h | 93 ++ fs/fscache/fsdef.c | 110 ++ fs/fscache/main.c | 105 ++ fs/fscache/page.c | 537 +++++++++++ include/linux/fscache-cache.h | 243 +++++ include/linux/fscache.h | 496 ++++++++++ 13 files changed, 3916 insertions(+), 0 deletions(-)
Documentation/filesystems/caching/backend-api.txt new file +357 -0
@@ -0,0 +1,357 @@ + ========================== + FS-CACHE CACHE BACKEND API + ========================== + +The FS-Cache system provides an API by which actual caches can be supplied to +FS-Cache for it to then serve out to network filesystems and other interested +parties. + +This API is declared in <linux/fscache-cache.h>. + + +==================================== +INITIALISING AND REGISTERING A CACHE +==================================== + +To start off, a cache definition must be initialised and registered for each +cache the backend wants to make available. For instance, CacheFS does this in +the fill_super() operation on mounting. + +The cache definition (struct fscache_cache) should be initialised by calling: + + void fscache_init_cache(struct fscache_cache *cache, + struct fscache_cache_ops *ops, + const char *idfmt, + ...) + +Where: + + (*) "cache" is a pointer to the cache definition; + + (*) "ops" is a pointer to the table of operations that the backend supports on + this cache; + + (*) and a format and printf-style arguments for constructing a label for the + cache. + + +The cache should then be registered with FS-Cache by passing a pointer to the +previously initialised cache definition to: + + int fscache_add_cache(struct fscache_cache *cache, + struct fscache_object *fsdef, + const char *tagname); + +Two extra arguments should also be supplied: + + (*) "fsdef" which should point to the object representation for the FS-Cache + master index in this cache. Netfs primary index entries will be created + here. + + (*) "tagname" which, if given, should be a text string naming this cache. If + this is NULL, the identifier will be used instead. For CacheFS, the + identifier is set to name the underlying block device and the tag can be + supplied by mount. + +This function may return -ENOMEM if it ran out of memory or -EEXIST if the tag +is already in use. 0 will be returned on success. + + +===================== +UNREGISTERING A CACHE +===================== + +A cache can be withdrawn from the system by calling this function with a +pointer to the cache definition: + + void fscache_withdraw_cache(struct fscache_cache *cache) + +In CacheFS's case, this is called by put_super(). + + +================== +FS-CACHE UTILITIES +================== + +FS-Cache provides some utilities that a cache backend may make use of: + + (*) Find the parent of an object: + + struct fscache_object * + fscache_find_parent_object(struct fscache_object *object) + + This allows a backend to find the logical parent of an index or data file + in the cache hierarchy. + + (*) Note occurrence of an I/O error in a cache: + + void fscache_io_error(struct fscache_cache *cache) + + This tells FS-Cache that an I/O error occurred in the cache. After this + has been called, only resource dissociation operations (object and page + release) will be passed from the netfs to the cache backend for the + specified cache. + + This does not actually withdraw the cache. That must be done separately. + + (*) Get an extra reference to a read or write context: + + void *fscache_get_context(struct fscache_cookie *cookie, void *context) + + and release a reference: + + void *fscache_put_context(struct fscache_cookie *cookie, void *context) + + These should be used to maintain the presence of the read or write context + passed to the cache read/write functions. This context must then be + passed to the I/O completion function. + + +======================== +RELEVANT DATA STRUCTURES +======================== + + (*) Index/Data file FS-Cache representation cookie: + + struct fscache_cookie { + struct fscache_object_def *def; + struct fscache_netfs *netfs; + void *netfs_data; + ... + }; + + The fields that might be of use to the backend describe the object + definition, the netfs definition and the netfs's data for this cookie. + The object definition contain functions supplied by the netfs for loading + and matching index entries; these are required to provide some of the + cache operations. + + (*) In-cache object representation: + + struct fscache_object { + struct fscache_cache *cache; + struct fscache_cookie *cookie; + unsigned long flags; + #define FSCACHE_OBJECT_RECYCLING 1 + ... + }; + + Structures of this type should be allocated by the cache backend and + passed to FS-Cache when requested by the appropriate cache operation. In + the case of CacheFS, they're embedded in CacheFS's internal object + structures. + + Each object contains a pointer to the cookie that represents the object it + is backing. It also contains a flag that indicates whether the object is + being retired when put_object() is called. This should be initialised by + calling fscache_object_init(object). + + +================ +CACHE OPERATIONS +================ + +The cache backend provides FS-Cache with a table of operations that can be +performed on the denizens of the cache. These are held in a structure of type: + + struct fscache_cache_ops + + (*) Name of cache provider [mandatory]: + + const char *name + + This isn't strictly an operation, but should be pointed at a string naming + the backend. + + (*) Object lookup [mandatory]: + + struct fscache_object *(*lookup_object)(struct fscache_cache *cache, + struct fscache_object *parent, + struct fscache_cookie *cookie) + + This method is used to look up an object in the specified cache, given a + pointer to the parent object and the cookie to which the object will be + attached. This should instantiate that object in the cache if it can, or + return -ENOBUFS or -ENOMEM if it can't. + + (*) Increment object refcount [mandatory]: + + struct fscache_object *(*grab_object)(struct fscache_object *object) + + This method is called to increment the reference count on an object. It + may fail (for instance if the cache is being withdrawn) by returning NULL. + It should return the object pointer if successful. + + (*) Lock/Unlock object [mandatory]: + + void (*lock_object)(struct fscache_object *object) + void (*unlock_object)(struct fscache_object *object) + + These methods are used to exclusively lock an object. It must be possible + to schedule with the lock held, so a spinlock isn't sufficient. + + (*) Pin/Unpin object [optional]: + + int (*pin_object)(struct fscache_object *object) + void (*unpin_object)(struct fscache_object *object) + + These methods are used to pin an object into the cache. Once pinned an + object cannot be reclaimed to make space. Return -ENOSPC if there's not + enough space in the cache to permit this. + + (*) Update object [mandatory]: + + int (*update_object)(struct fscache_object *object) + + This is called to update the index entry for the specified object. The + new information should be in object->cookie->netfs_data. This can be + obtained by calling object->cookie->def->get_aux()/get_attr(). + + (*) Release object reference [mandatory]: + + void (*put_object)(struct fscache_object *object) + + This method is used to discard a reference to an object. The object may + be destroyed when all the references held by FS-Cache are released. + + (*) Synchronise a cache [mandatory]: + + void (*sync)(struct fscache_cache *cache) + + This is called to ask the backend to synchronise a cache with its backing + device. + + (*) Dissociate a cache [mandatory]: + + void (*dissociate_pages)(struct fscache_cache *cache) + + This is called to ask a cache to perform any page dissociations as part of + cache withdrawal. + + (*) Set the data size on a cache file [mandatory]: + + int (*set_i_size)(struct fscache_object *object, loff_t i_size); + + This is called to indicate to the cache the maximum size a file may reach. + The cache may use this to reserve space on the cache. It may also return + -ENOBUFS to indicate that insufficient space is available to expand the + metadata used to track the data. It should return 0 if successful or + -ENOMEM or -EIO on error. + + (*) Reserve cache space for an object's data [optional]: + + int (*reserve_space)(struct fscache_object *object, loff_t size); + + This is called to request that cache space be reserved to hold the data + for an object and the metadata used to track it. Zero size should be + taken as request to cancel a reservation. + + This should return 0 if successful, -ENOSPC if there isn't enough space + available, or -ENOMEM or -EIO on other errors. + + The reservation may exceed the size of the object, thus permitting future + expansion. If the amount of space consumed by an object would exceed the + reservation, it's permitted to refuse requests to allocate pages, but not + required. An object may be pruned down to its reservation size if larger + than that already. + + (*) Request page be read from cache [mandatory]: + + int (*read_or_alloc_page)(struct fscache_object *object, + struct page *page, + fscache_rw_complete_t end_io_func, + void *end_io_data, + gfp_t gfp) + + This is called to attempt to read a netfs page from the cache, or to + reserve a backing block if not. FS-Cache will have done as much checking + as it can before calling, but most of the work belongs to the backend. + + If there's no page in the cache, then -ENODATA should be returned if the + backend managed to reserve a backing block; -ENOBUFS, -ENOMEM or -EIO if + it didn't. + + If there is a page in the cache, then a read operation should be queued + and 0 returned. When the read finishes, end_io_func() should be called + with the following arguments: + + (*end_io_func)(object->cookie->netfs_data, + page, + end_io_data, + error); + + The mark_pages_cached() cookie operation should be called for the page if + any cache metadata is retained. This will indicate to the netfs that the + page needs explicit uncaching. This operation takes a pagevec, thus + allowing several pages to be marked at once. + + (*) Request pages be read from cache [mandatory]: + + int (*read_or_alloc_pages)(struct fscache_object *object, + struct address_space *mapping, + struct list_head *pages, + unsigned *nr_pages, + fscache_rw_complete_t end_io_func, + void *end_io_data, + gfp_t gfp) + + This is like the previous operation, except it will be handed a list of + pages instead of one page. Any pages on which a read operation is started + must be added to the page cache for the specified mapping and also to the + LRU. Such pages must also be removed from the pages list and nr_pages + decremented per page. + + If there was an error such as -ENOMEM, then that should be returned; else + if one or more pages couldn't be read or allocated, then -ENOBUFS should + be returned; else if one or more pages couldn't be read, then -ENODATA + should be returned. If all the pages are dispatched then 0 should be + returned. + + (*) Request page be allocated in the cache [mandatory]: + + int (*allocate_page)(struct fscache_object *object, + struct page *page, + gfp_t gfp) + + This is like read_or_alloc_page(), except that it shouldn't read from the + cache, even if there's data there that could be retrieved. It should, + however, set up any internal metadata required such that write_page() can + write to the cache. + + If there's no backing block available, then -ENOBUFS should be returned + (or -ENOMEM or -EIO if there were other problems). If a block is + successfully allocated, then the netfs page should be marked and 0 + returned. + + (*) Request page be written to cache [mandatory]: + + int (*write_page)(struct fscache_object *object, + struct page *page, + fscache_rw_complete_t end_io_func, + void *end_io_data, + gfp_t gfp) + + This is called to write from a page on which there was a previously + successful read_or_alloc_page() call. FS-Cache filters out pages that + don't have mappings. + + If there's no backing block available, then -ENOBUFS should be returned + (or -ENOMEM or -EIO if there were other problems). + + If the write operation could be queued, then 0 should be returned. When + the write completes, end_io_func() should be called with the following + arguments: + + (*end_io_func)(object->cookie->netfs_data, + page, + end_io_data, + error); + + (*) Discard retained per-page metadata [mandatory]: + + void (*uncache_pages)(struct fscache_object *object, + struct pagevec *pagevec) + + This is called when one or more netfs pages are being evicted from the + pagecache. The cache backend should tear down any internal representation + or tracking it maintains.
Documentation/filesystems/caching/fscache.txt new file +151 -0
151 lines not on this page · raw message
Documentation/filesystems/caching/netfs-api.txt new file +752 -0
752 lines not on this page · raw message
fs/Kconfig +15 -0
@@ -530,6 +530,21 @@ config FUSE_FS If you want to develop a userspace FS, or if you want to use a filesystem based on FUSE, answer Y or M. +menu "Caches" + +config FSCACHE + tristate "General filesystem cache manager" + depends on EXPERIMENTAL + help + This option enables a generic filesystem caching manager that can be + used by various network and other filesystems to cache data + locally. Different sorts of caches can be plugged in, depending on the + resources available. + + See Documentation/filesystems/caching/fscache.txt for more information. + +endmenu + menu "CD-ROM/DVD Filesystems" config ISO9660_FS
fs/Makefile +1 -0
@@ -52,6 +52,7 @@ obj-y += devpts/ obj-$(CONFIG_PROFILING) += dcookies.o # Do not add any filesystems before this line +obj-$(CONFIG_FSCACHE) += fscache/ obj-$(CONFIG_REISERFS_FS) += reiserfs/ obj-$(CONFIG_EXT3_FS) += ext3/ # Before ext2 so root fs can be ext3 obj-$(CONFIG_JBD) += jbd/
fs/fscache/Makefile new file +11 -0
@@ -0,0 +1,11 @@ +# +# Makefile for general filesystem caching code +# + +fscache-objs := \ + cookie.o \ + fsdef.o \ + main.o \ + page.o + +obj-$(CONFIG_FSCACHE) := fscache.o
fs/fscache/cookie.c new file +1045 -0
1,045 lines not on this page · raw message
fs/fscache/fscache-int.h new file +93 -0
93 lines not on this page · raw message
fs/fscache/fsdef.c new file +110 -0
110 lines not on this page · raw message
fs/fscache/main.c new file +105 -0
105 lines not on this page · raw message
fs/fscache/page.c new file +537 -0
348 lines not on this page · raw message
include/linux/fscache-cache.h new file +243 -0
243 lines not on this page · raw message
include/linux/fscache.h new file +496 -0
496 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.
David Howells
maintainerPATCH 24/30 FS-Cache: Release page->private in failed readahead [try #11]
In reply to David HowellsThe attached patch causes read_cache_pages() to release page-private data on a page for which add_to_page_cache() fails or the filler function fails. This permits pages with caching references associated with them to be cleaned up.
Further changes [try #9] that have been made:
(*) The try_to_release_page() is called instead of calling the releasepage()
op directly.
(*) The page is locked before try_to_release_page() is called.
(*) The call to try_to_release_page() and page_cache_release() have been
abstracted out into a helper function as this bit of code occurs twice..
Further changes [try #10] that have been made:
(*) The comment header on the helper function is much expanded. This states
why there's a need to call the releasepage() op in the event of an error.
(*) BUG() if the page is already locked when we try and lock it.
(*) Don't set the page mapping pointer until we've locked the page.
(*) The page is unlocked after try_to_release_page() is called.
---
mm/readahead.c | 25 +++++++++++++++++++++++-- 1 files changed, 23 insertions(+), 2 deletions(-)
mm/readahead.c +23 -2
@@ -14,6 +14,7 @@ #include <linux/module.h>#include <linux/blkdev.h> #include <linux/backing-dev.h> #include <linux/pagevec.h> +#include <linux/buffer_head.h> void default_unplug_io_fn (struct backing_dev_info *bdi,struct page *page) {
@@ -117,6 +118,26 @@ static inline unsigned long get_next_ra_#define list_to_page (head) (list_entry((head)->prev, struct page, lru)) +/* +* see if a page needs releasing upon read_cache_pages() failure +* - the caller of read_cache_pages() may have set PG_private before calling, +* such as the NFS fs marking pages that are cached locally on disk, thus we +* need to give the fs a chance to clean up in the event of an error +*/ +static void read_cache_pages_release_page (struct address_space *mapping, +struct page *page) +{ +if (PagePrivate (page)) { +if (TestSetPageLocked (page)) +BUG (); + page->mapping = mapping; +try_to_release_page (page,GFP_KERNEL ); + page->mapping =NULL ; +unlock_page (page); + } +page_cache_release (page); +} +/** * read_cache_pages - populate an address space with some pages & start reads against them * @mapping: the address_space
@@ -140,7 +161,7 @@ int read_cache_pages(struct address_spac page =list_to_page (pages);list_del (&page->lru);if (add_to_page_cache (page, mapping, page->index,GFP_KERNEL )) { -page_cache_release (page); +read_cache_pages_release_page (mapping, page);continue ; } ret =filler (data, page);
@@ -152,7 +173,7 @@ int read_cache_pages(struct address_spac victim =list_to_page (pages);list_del (&victim->lru); -page_cache_release (victim); +read_cache_pages_release_page (mapping, victim); }break ; }
David Howells
maintainerPATCH 25/30 FS-Cache: Make kAFS use FS-Cache [try #11]
In reply to David HowellsThe attached patch makes the kAFS filesystem in fs/afs/ use FS-Cache, and through it any attached caches. The kAFS filesystem will use caching automatically if it's available.
---
fs/Kconfig | 7 + fs/afs/cache.h | 27 ------ fs/afs/cell.c | 109 ++++++++++++++--------- fs/afs/cell.h | 16 +-- fs/afs/cmservice.c | 2 fs/afs/dir.c | 10 +- fs/afs/file.c | 246 ++++++++++++++++++++++++++++++++++------------------ fs/afs/fsclient.c | 4 + fs/afs/inode.c | 45 +++++++-- fs/afs/internal.h | 25 ++--- fs/afs/main.c | 24 ++--- fs/afs/mntpt.c | 12 +-- fs/afs/proc.c | 1 fs/afs/server.c | 3 - fs/afs/vlocation.c | 179 +++++++++++++++++++++++--------------- fs/afs/vnode.c | 248 +++++++++++++++++++++++++++++++++++++++++++--------- fs/afs/vnode.h | 10 +- fs/afs/volume.c | 78 ++++++---------- fs/afs/volume.h | 28 +----- 19 files changed, 662 insertions(+), 412 deletions(-)
fs/Kconfig +7 -0
@@ -1922,6 +1922,13 @@ # for fs/nls/Config.in If unsure, say N. +config AFS_FSCACHE + bool "Provide AFS client caching support" + depends on AFS_FS && FSCACHE && EXPERIMENTAL + help + Say Y here if you want AFS data to be cached locally on through the + generic filesystem cache manager + config RXRPC tristate
fs/afs/cache.h deleted +0 -27
@@ -1,27 +0,0 @@ -/* cache.h: AFS local cache management interface -* -* Copyright (C) 2002 Red Hat, Inc. All Rights Reserved. -* Written by David Howells ([email protected]) -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version -* 2 of the License, or (at your option) any later version. -*/ - -#ifndef _LINUX_AFS_CACHE_H -#define _LINUX_AFS_CACHE_H - -#undef AFS_CACHING_SUPPORT - -#include <linux/mm.h> -#ifdef AFS_CACHING_SUPPORT -#include <linux/cachefs.h> -#endif -#include "types.h" - -#ifdef __KERNEL__ - -#endif /* __KERNEL__ */ - -#endif /* _LINUX_AFS_CACHE_H */
fs/afs/cell.c +65 -44
146 lines not on this page · raw message
fs/afs/cell.h +3 -13
@@ -13,7 +13,7 @@ #ifndef _LINUX_AFS_CELL_H#define _LINUX_AFS_CELL_H#include "types.h" -#include "cache.h" +#include <linux/fscache.h> #define AFS_CELL_MAX_ADDRS 15
@@ -21,16 +21,6 @@ extern volatile int afs_cells_being_purg/*****************************************************************************/ /* -* entry in the cached cell catalogue -*/ -struct afs_cache_cell -{ -char name[64 ];/* cell name (padded with NULs) */ -struct in_addr vl_servers[15 ];/* cached cell VL servers */ -}; - -/*****************************************************************************/ -/* * AFS cell record */ struct afs_cell
@@ -39,8 +29,8 @@ struct afs_cellstruct list_head link;/* main cell list link */ struct list_head proc_link;/* /proc cell list link */ struct proc_dir_entry *proc_dir;/* /proc dir for this cell */ -#ifdef AFS_CACHING_SUPPORT -struct cachefs_cookie *cache;/* caching cookie */ +#ifdef CONFIG_AFS_FSCACHE +struct fscache_cookie *cache;/* caching cookie */ #endif /* server record management */
fs/afs/cmservice.c +1 -1
@@ -24,7 +24,7 @@ #include "cmservice.h"#include "internal.h" static unsigned afscm_usage;/* AFS cache manager usage count */ -static struct rw_semaphore afscm_sem;/* AFS cache manager start/stop semaphore */ +static DECLARE_RWSEM (afscm_sem);/* AFS cache manager start/stop semaphore */ static int afscm_new_call (struct rxrpc_call *call);static void afscm_attention (struct rxrpc_call *call);
fs/afs/dir.c +6 -4
@@ -145,7 +145,7 @@ #endif qty /=sizeof (union afs_dir_block );/* check them */ - dbuf =page_address (page); + dbuf =kmap_atomic (page,KM_USER0 );for (tmp =0 ; tmp < qty; tmp++) {if (dbuf->blocks[tmp].pagehdr.magic !=AFS_DIR_MAGIC ) { printk("kAFS: %s(%lu): bad magic %d/%d is %04hx\n",
@@ -154,10 +154,12 @@ #endif goto error; } } +kunmap_atomic (dbuf,KM_USER0 );return ; error: +kunmap_atomic (dbuf,KM_USER0 );SetPageError (page); }/* end afs_dir_check_page() */
@@ -168,7 +170,6 @@ #endif*/ static inline void afs_dir_put_page (struct page *page) { -kunmap (page);page_cache_release (page); }/* end afs_dir_put_page() */
@@ -186,7 +187,6 @@ static struct page *afs_dir_get_page(str page =read_mapping_page (dir->i_mapping, index,NULL );if (!IS_ERR (page)) {wait_on_page_locked (page); -kmap (page);if (!PageUptodate (page)) goto fail;afs_dir_check_page (dir, page);
@@ -354,7 +354,7 @@ static int afs_dir_iterate(struct inode limit = blkoff & ~(PAGE_SIZE -1 ); - dbuf =page_address (page); + dbuf =kmap_atomic (page,KM_USER0 );/* deal with the individual blocks stashed on this page */ do {
@@ -363,6 +363,7 @@ static int afs_dir_iterate(struct inode ret =afs_dir_iterate_block (fpos, dblock, blkoff, cookie, filldir);if (ret !=1 ) { +kunmap_atomic (dbuf,KM_USER0 );afs_dir_put_page (page); goto out; }
@@ -371,6 +372,7 @@ static int afs_dir_iterate(struct inode }while (*fpos < dir->i_size && blkoff < limit); +kunmap_atomic (dbuf,KM_USER0 );afs_dir_put_page (page); ret =0 ; }
fs/afs/file.c +164 -82
384 lines not on this page · raw message
fs/afs/fsclient.c +3 -1
@@ -398,6 +398,8 @@ int afs_rxfs_fetch_file_status(struct af bp++;/* spare6 */ } +_debug ("Data Version %llx\n" , vnode->status.version); +/* success */ ret =0 ;
@@ -408,7 +410,7 @@ int afs_rxfs_fetch_file_status(struct af out_put_conn:afs_server_release_callslot (server, &callslot); out: -_leave ("" ); +_leave (" = %d" , ret);return ret; abort:
fs/afs/inode.c +31 -14
91 lines not on this page · raw message
fs/afs/internal.h +10 -15
@@ -16,15 +16,17 @@ #include <linux/compiler.h>#include <linux/kernel.h> #include <linux/fs.h> #include <linux/pagemap.h> +#include <linux/fscache.h> /* * debug tracing */ -#define kenter(FMT, a...) printk("==> %s("FMT")\n",__FUNCTION__ , ## a) -#define kleave(FMT, a...) printk("<== %s()"FMT"\n",__FUNCTION__ , ## a) -#define kdebug(FMT, a...) printk(FMT"\n" , ## a) -#define kproto(FMT, a...) printk("### "FMT"\n" , ## a) -#define knet(FMT, a...) printk(FMT"\n" , ## a) +#define __kdbg(FMT, a...) printk("[%05d] "FMT"\n", current->pid , ## a) +#define kenter(FMT, a...) __kdbg("==> %s("FMT")", __FUNCTION__ , ## a) +#define kleave(FMT, a...) __kdbg("<== %s()"FMT, __FUNCTION__ , ## a) +#define kdebug(FMT, a...) __kdbg(FMT , ## a) +#define kproto(FMT, a...) __kdbg("### "FMT , ## a) +#define knet(FMT, a...) __kdbg(FMT , ## a)#ifdef __KDEBUG #define _enter(FMT, a...) kenter(FMT , ## a)
@@ -56,9 +58,6 @@ static inline void afs_discard_my_signal*/ extern struct rw_semaphore afs_proc_cells_sem;extern struct list_head afs_proc_cells; -#ifdef AFS_CACHING_SUPPORT -extern struct cachefs_index_def afs_cache_cell_index_def; -#endif /* * dir.c
@@ -71,11 +70,7 @@ extern const struct file_operations afs_*/ extern const struct address_space_operations afs_fs_aops;extern struct inode_operations afs_file_inode_operations; - -#ifdef AFS_CACHING_SUPPORT -extern int afs_cache_get_page_cookie (struct page *page, -struct cachefs_page **_page_cookie); -#endif +extern const struct file_operations afs_file_file_operations;/* * inode.c
@@ -97,8 +92,8 @@ #endif/* * main.c */ -#ifdef AFS_CACHING_SUPPORT -extern struct cachefs_netfs afs_cache_netfs; +#ifdef CONFIG_AFS_FSCACHE +extern struct fscache_netfs afs_cache_netfs;#endif /*
fs/afs/main.c +11 -13
@@ -1,6 +1,6 @@/* main.c: AFS client file system * -* Copyright (C) 2002 Red Hat, Inc. All Rights Reserved. +* Copyright (C) 2002,5 Red Hat, Inc. All Rights Reserved. * Written by David Howells ([email protected]) * * This program is free software; you can redistribute it and/or
@@ -14,11 +14,11 @@ #include <linux/moduleparam.h>#include <linux/init.h> #include <linux/sched.h> #include <linux/completion.h> +#include <linux/fscache.h> #include <rxrpc/rxrpc.h> #include <rxrpc/transport.h> #include <rxrpc/call.h> #include <rxrpc/peer.h> -#include "cache.h" #include "cell.h" #include "server.h" #include "fsclient.h"
@@ -51,12 +51,11 @@ static struct rxrpc_peer_ops afs_peer_opstruct list_head afs_cb_hash_tbl[AFS_CB_HASH_COUNT ];DEFINE_SPINLOCK (afs_cb_hash_lock); -#ifdef AFS_CACHING_SUPPORT -static struct cachefs_netfs_operations afs_cache_ops = { - .get_page_cookie = afs_cache_get_page_cookie, +#ifdef CONFIG_AFS_FSCACHE +static struct fscache_netfs_operations afs_cache_ops = { }; -struct cachefs_netfs afs_cache_netfs = { +struct fscache_netfs afs_cache_netfs = { .name ="afs" , .version =0 , .ops = &afs_cache_ops,
@@ -83,10 +82,9 @@ static int __init afs_init(void)if (ret <0 )return ret; -#ifdef AFS_CACHING_SUPPORT +#ifdef CONFIG_AFS_FSCACHE /* we want to be able to cache */ - ret =cachefs_register_netfs (&afs_cache_netfs, - &afs_cache_cell_index_def); + ret =fscache_register_netfs (&afs_cache_netfs);if (ret <0 ) goto error;#endif
@@ -137,8 +135,8 @@ #ifdef CONFIG_KEYS_TURNED_OFFafs_key_unregister (); error_cache:#endif -#ifdef AFS_CACHING_SUPPORT -cachefs_unregister_netfs (&afs_cache_netfs); +#ifdef CONFIG_AFS_FSCACHE +fscache_unregister_netfs (&afs_cache_netfs); error:#endif afs_cell_purge ();
@@ -167,8 +165,8 @@ static void __exit afs_exit(void)#ifdef CONFIG_KEYS_TURNED_OFF afs_key_unregister ();#endif -#ifdef AFS_CACHING_SUPPORT -cachefs_unregister_netfs (&afs_cache_netfs); +#ifdef CONFIG_AFS_FSCACHE +fscache_unregister_netfs (&afs_cache_netfs);#endif afs_proc_cleanup ();
fs/afs/mntpt.c +6 -6
@@ -78,7 +78,7 @@ int afs_mntpt_check_symlink(struct afs_v ret = -EIO ;wait_on_page_locked (page); - buf =kmap (page); + buf =kmap_atomic (page,KM_USER0 );if (!PageUptodate (page)) goto out_free;if (PageError (page))
@@ -101,7 +101,7 @@ int afs_mntpt_check_symlink(struct afs_v ret =0 ; out_free: -kunmap (page); +kunmap_atomic (buf,KM_USER0 );page_cache_release (page); out:_leave (" = %d" , ret);
@@ -188,9 +188,9 @@ static struct vfsmount *afs_mntpt_do_autif (!PageUptodate (page) ||PageError (page)) goto error; - buf =kmap (page); + buf =kmap_atomic (page,KM_USER0 );memcpy (devname, buf, size); -kunmap (page); +kunmap_atomic (buf,KM_USER0 );page_cache_release (page); page =NULL ;
@@ -269,12 +269,12 @@ static void *afs_mntpt_follow_link(struc*/ static void afs_mntpt_expiry_timed_out (struct afs_timer *timer) { -kenter ("" ); +// kenter(""); mark_mounts_for_expiry (&afs_vfsmounts);afs_kafstimod_add_timer (&afs_mntpt_expiry_timer, afs_mntpt_expiry_timeout *HZ ); -kleave ("" ); +// kleave(""); }/* end afs_mntpt_expiry_timed_out() */
fs/afs/proc.c +1 -0
@@ -177,6 +177,7 @@ int afs_proc_init(void)*/ void afs_proc_cleanup (void ) { +remove_proc_entry ("rootcell" , proc_afs);remove_proc_entry ("cells" , proc_afs);remove_proc_entry ("fs/afs" ,NULL );
fs/afs/server.c +1 -2
@@ -375,7 +375,6 @@ int afs_server_request_callslot(struct aelse if (list_empty (&server->fs_callq)) {/* no one waiting */ server->fs_conn_cnt[nconn]++; -spin_unlock (&server->fs_lock); }else {/* someone's waiting - dequeue them and wake them up */
@@ -393,9 +392,9 @@ int afs_server_request_callslot(struct a } pcallslot->ready =1 ;wake_up_process (pcallslot->task); -spin_unlock (&server->fs_lock); } +spin_unlock (&server->fs_lock);rxrpc_put_connection (callslot->conn); callslot->conn =NULL ;
fs/afs/vlocation.c +110 -69
237 lines not on this page · raw message
fs/afs/vnode.c +204 -44
287 lines not on this page · raw message
fs/afs/vnode.h +5 -5
@@ -13,9 +13,9 @@ #ifndef _LINUX_AFS_VNODE_H#define _LINUX_AFS_VNODE_H#include <linux/fs.h> +#include <linux/fscache.h> #include "server.h" #include "kafstimod.h" -#include "cache.h" #ifdef __KERNEL__
@@ -32,8 +32,8 @@ struct afs_cache_vnodeafs_dataversion_t data_version;/* data version */ }; -#ifdef AFS_CACHING_SUPPORT -extern struct cachefs_index_def afs_vnode_cache_index_def; +#ifdef CONFIG_AFS_FSCACHE +extern struct fscache_cookie_def afs_vnode_cache_index_def;#endif /*****************************************************************************/
@@ -47,8 +47,8 @@ struct afs_vnodestruct afs_volume *volume;/* volume on which vnode resides */ struct afs_fid fid;/* the file identifier for this inode */ struct afs_file_status status;/* AFS status info for this file */ -#ifdef AFS_CACHING_SUPPORT -struct cachefs_cookie *cache;/* caching cookie */ +#ifdef CONFIG_AFS_FSCACHE +struct fscache_cookie *cache;/* caching cookie */ #endif wait_queue_head_t update_waitq;/* status fetch waitqueue */
fs/afs/volume.c +29 -49
116 lines not on this page · raw message
fs/afs/volume.h +5 -23
@@ -12,11 +12,11 @@ #ifndef _LINUX_AFS_VOLUME_H #define _LINUX_AFS_VOLUME_H +#include <linux/fscache.h> #include "types.h" #include "fsclient.h" #include "kafstimod.h" #include "kafsasyncd.h" -#include "cache.h" typedef enum { AFS_VLUPD_SLEEP, /* sleeping waiting for update timer to fire */
@@ -45,24 +45,6 @@ #define AFS_VOL_VTM_BAK 0x04 /* backup vtime_t rtime;/* last retrieval time */ }; -#ifdef AFS_CACHING_SUPPORT -extern struct cachefs_index_def afs_vlocation_cache_index_def; -#endif - -/*****************************************************************************/ -/* -* volume -> vnode hash table entry -*/ -struct afs_cache_vhash -{ -afs_voltype_t vtype;/* which volume variation */ -uint8_t hash_bucket;/* which hash bucket this represents */ -} __attribute__((packed)); - -#ifdef AFS_CACHING_SUPPORT -extern struct cachefs_index_def afs_volume_cache_index_def; -#endif -/*****************************************************************************/ /* * AFS volume location record
@@ -73,8 +55,8 @@ struct afs_vlocationstruct list_head link;/* link in cell volume location list */ struct afs_timer timeout;/* decaching timer */ struct afs_cell *cell;/* cell to which volume belongs */ -#ifdef AFS_CACHING_SUPPORT -struct cachefs_cookie *cache;/* caching cookie */ +#ifdef CONFIG_AFS_FSCACHE +struct fscache_cookie *cache;/* caching cookie */ #endif struct afs_cache_vlocation vldb;/* volume information DB record */ struct afs_volume *vols[3 ];/* volume access record pointer (index by type) */
@@ -109,8 +91,8 @@ struct afs_volumeatomic_t usage;struct afs_cell *cell;/* cell to which belongs (unrefd ptr) */ struct afs_vlocation *vlocation;/* volume location */ -#ifdef AFS_CACHING_SUPPORT -struct cachefs_cookie *cache;/* caching cookie */ +#ifdef CONFIG_AFS_FSCACHE +struct fscache_cookie *cache;/* caching cookie */ #endif afs_volid_t vid;/* volume ID */ afs_voltype_t type;/* type of volume */
David Howells
maintainerPATCH 26/30 NFS: Use local caching [try #11]
In reply to David HowellsThe attached patch makes it possible for the NFS filesystem to make use of the network filesystem local caching service (FS-Cache).
To be able to use this, an updated mount program is required. This can be obtained from:
http://people.redhat.com/steved/cachefs/util-linux/
To mount an NFS filesystem to use caching, add an "fsc" option to the mount:
mount warthog:/ /a -o fsc
---
fs/Kconfig | 7 + fs/nfs/Makefile | 1 fs/nfs/client.c | 11 + fs/nfs/file.c | 33 +++ fs/nfs/fscache.c | 346 +++++++++++++++++++++++++++++++++ fs/nfs/fscache.h | 466 ++++++++++++++++++++++++++++++++++++++++++++ fs/nfs/inode.c | 22 ++ fs/nfs/internal.h | 32 +++ fs/nfs/pagelist.c | 3 fs/nfs/read.c | 30 +++ fs/nfs/super.c | 1 fs/nfs/sysctl.c | 43 ++++ fs/nfs/write.c | 11 + include/linux/nfs4_mount.h | 1 include/linux/nfs_fs.h | 5 include/linux/nfs_fs_sb.h | 5 include/linux/nfs_mount.h | 1 17 files changed, 1010 insertions(+), 8 deletions(-)
fs/Kconfig +7 -0
@@ -1485,6 +1485,13 @@ config NFS_V4 If unsure, say N. +config NFS_FSCACHE + bool "Provide NFS client caching support (EXPERIMENTAL)" + depends on NFS_FS && FSCACHE && EXPERIMENTAL + help + Say Y here if you want NFS data to be cached locally on disc through + the general filesystem cache manager + config NFS_DIRECTIO bool "Allow direct I/O on NFS files (EXPERIMENTAL)" depends on NFS_FS && EXPERIMENTAL
fs/nfs/Makefile +1 -0
@@ -16,4 +16,5 @@ nfs-$(CONFIG_NFS_V4) += nfs4proc.o nfs4x nfs4namespace.o nfs-$(CONFIG_NFS_DIRECTIO) += direct.o nfs-$(CONFIG_SYSCTL) += sysctl.o +nfs-$(CONFIG_NFS_FSCACHE) += fscache.o nfs-objs := $(nfs-y)
fs/nfs/client.c +8 -3
@@ -150,6 +150,8 @@ #ifdef CONFIG_NFS_V4 clp->cl_state =1 <<NFS4CLNT_LEASE_EXPIRED ;#endif +nfs_fscache_get_client_cookie (clp); +return clp; error_3:
@@ -187,6 +189,8 @@ #ifdef CONFIG_NFS_V4 }#endif +nfs_fscache_release_client_cookie (clp); +/* -EIO all pending I/O */ if (!IS_ERR (clp->cl_rpcclient))rpc_shutdown_client (clp->cl_rpcclient);
@@ -1363,7 +1367,7 @@ static int nfs_volume_list_show(struct s/* display header on line 1 */ if (v ==SEQ_START_TOKEN ) { -seq_puts (m,"NV SERVER PORT DEV FSID\n" ); +seq_puts (m,"NV SERVER PORT DEV FSID FSC\n" );return 0 ; }/* display one transport per line on subsequent lines */
@@ -1376,12 +1380,13 @@ static int nfs_volume_list_show(struct ssnprintf (fsid,17 ,"%llx:%llx" , server->fsid.major, server->fsid.minor); -seq_printf (m,"v%d %02x%02x%02x%02x %4hx %-7s %-17s\n" , +seq_printf (m,"v%d %02x%02x%02x%02x %4hx %-7s %-17s %s\n" , clp->cl_nfsversion,NIPQUAD (clp->cl_addr.sin_addr),ntohs (clp->cl_addr.sin_port), dev, - fsid); + fsid, +nfs_server_fscache_state (server));return 0 ; }
fs/nfs/file.c +32 -1
@@ -27,12 +27,14 @@ #include <linux/mm.h>#include <linux/slab.h> #include <linux/pagemap.h> #include <linux/smp_lock.h> +#include <linux/buffer_head.h> #include <asm/uaccess.h> #include <asm/system.h> #include "delegation.h" #include "iostat.h" +#include "internal.h" #define NFSDBG_FACILITY NFSDBG_FILE
@@ -249,6 +251,10 @@ nfs_file_mmap(struct file * file, struct status =nfs_revalidate_mapping (inode, file->f_mapping);if (!status) status =generic_file_mmap (file, vma); + +if (status ==0 ) +nfs_fscache_install_vm_ops (inode, vma); +return status; }
@@ -308,13 +314,35 @@ static void nfs_invalidate_page(struct p/* Cancel any unstarted writes on this page */ if (offset ==0 )nfs_sync_inode_wait (inode, page->index,1 ,FLUSH_INVALIDATE ); + +nfs_fscache_invalidate_page (page, inode, offset); + +/* we can do this here as the bits are only set with the page lock +* held, and our caller is holding that */ +if (!page->private) +ClearPagePrivate (page); }static int nfs_release_page (struct page *page,gfp_t gfp) { -return !nfs_wb_page (page->mapping->host, page); +int error =nfs_wb_page (page->mapping->host, page); + +if (error ==0 ) { +nfs_fscache_release_page (page); + +/* may have been set due to either caching or writing */ +ClearPagePrivate (page); + } + +/* releasepage() returns true/false */ +return (error ==0 ) ?1 :0 ; } +/* +* Since we use page->private for our own nefarious purposes when using +* fscache, we have to override extra address space ops to prevent fs/buffer.c +* from getting confused, even though we may not have asked its opinion +*/ const struct address_space_operations nfs_file_aops = { .readpage = nfs_readpage, .readpages = nfs_readpages,
@@ -328,6 +356,9 @@ const struct address_space_operations nf#ifdef CONFIG_NFS_DIRECTIO .direct_IO = nfs_direct_IO,#endif +#ifdef CONFIG_NFS_FSCACHE + .sync_page = block_sync_page, +#endif };/*
fs/nfs/fscache.c new file +346 -0
346 lines not on this page · raw message
fs/nfs/fscache.h new file +466 -0
466 lines not on this page · raw message
fs/nfs/inode.c +22 -0
@@ -88,6 +88,8 @@ void nfs_clear_inode(struct inode *inode cred = nfsi->cache_access.cred;if (cred)put_rpccred (cred); + +nfs_fscache_release_fh_cookie (NFS_SERVER (inode), nfsi);BUG_ON (atomic_read (&nfsi->data_updates) !=0 ); }
@@ -134,6 +136,8 @@ void nfs_zap_caches(struct inode *inode)spin_lock (&inode->i_lock);nfs_zap_caches_locked (inode);spin_unlock (&inode->i_lock); + +nfs_fscache_zap_fh_cookie (NFS_SERVER (inode),NFS_I (inode)); }static void nfs_zap_acl_cache (struct inode *inode)
@@ -212,6 +216,7 @@ nfs_fhget(struct super_block *sb, struct };struct inode *inode =ERR_PTR (-ENOENT );unsigned long hash; +int maycache =1 ;if ((fattr->valid &NFS_ATTR_FATTR ) ==0 ) goto out_no_inode;
@@ -260,6 +265,7 @@ nfs_fhget(struct super_block *sb, structelse inode->i_op = &nfs_mountpoint_inode_operations; inode->i_fop =NULL ; + maycache =0 ; } }else if (S_ISLNK (inode->i_mode)) inode->i_op = &nfs_symlink_inode_operations;
@@ -292,6 +298,8 @@ nfs_fhget(struct super_block *sb, structmemset (nfsi->cookieverf,0 ,sizeof (nfsi->cookieverf)); nfsi->cache_access.cred =NULL ; +nfs_fscache_get_fh_cookie (sb, nfsi, maycache); +unlock_new_inode (inode); }else nfs_refresh_inode (inode, fattr);
@@ -374,6 +382,7 @@ void nfs_setattr_update_inode(struct inoif ((attr->ia_valid &ATTR_SIZE ) !=0 ) {nfs_inc_stats (inode,NFSIOS_SETATTRTRUNC ); inode->i_size = attr->ia_size; +nfs_fscache_set_size (NFS_SERVER (inode),NFS_I (inode), inode->i_size);vmtruncate (inode, attr->ia_size); } }
@@ -556,6 +565,8 @@ int nfs_open(struct inode *inode, struct ctx->mode = filp->f_mode;nfs_file_set_open_context (filp, ctx);put_nfs_open_context (ctx); +if ((filp->f_flags &O_ACCMODE ) !=O_RDONLY ) +nfs_fscache_disable_fh_cookie (inode);return 0 ; }
@@ -694,6 +705,8 @@ int nfs_revalidate_mapping(struct inode }spin_unlock (&inode->i_lock); +nfs_fscache_renew_fh_cookie (NFS_SERVER (inode), nfsi); +dfprintk (PAGECACHE ,"NFS: (%s/%Ld) data cache invalidated\n" , inode->i_sb->s_id, (long long )NFS_FILEID (inode));
@@ -927,11 +940,13 @@ static int nfs_update_inode(struct inodeif (data_stable) { inode->i_size = new_isize; invalid |=NFS_INO_INVALID_DATA ; +nfs_fscache_set_size (NFS_SERVER (inode), nfsi, inode->i_size); } invalid |=NFS_INO_INVALID_ATTR ; }else if (new_isize > cur_isize) { inode->i_size = new_isize; invalid |=NFS_INO_INVALID_ATTR |NFS_INO_INVALID_DATA ; +nfs_fscache_set_size (NFS_SERVER (inode), nfsi, inode->i_size); } nfsi->cache_change_attribute = jiffies; dprintk("NFS: isize change on server for file %s/%ld\n",
@@ -1144,6 +1159,10 @@ static int __init init_nfs_fs(void) {int err; + err =nfs_fscache_register (); +if (err <0 ) + goto out6; + err =nfs_fs_proc_init ();if (err) goto out5;
@@ -1190,6 +1209,8 @@ out3: out4:nfs_fs_proc_exit (); out5: +nfs_fscache_unregister (); +out6:return err; }
@@ -1200,6 +1221,7 @@ static void __exit exit_nfs_fs(void)nfs_destroy_readpagecache ();nfs_destroy_inodecache ();nfs_destroy_nfspagecache (); +nfs_fscache_unregister ();#ifdef CONFIG_PROC_FS rpc_proc_unregister ("nfs" );#endif
fs/nfs/internal.h +32 -0
@@ -4,6 +4,30 @@#include <linux/mount.h> +#define NFS_PAGE_WRITING 0 +#define NFS_PAGE_CACHED 1 + +#define PageNfsBit (bit, page) test_bit(bit, &(page)->private) + +#define SetPageNfsBit (bit, page) \ +do { \ + SetPagePrivate((page)); \ + set_bit(bit, &(page)->private); \ +} while(0) + +#define ClearPageNfsBit (bit, page) \ +do { \ + clear_bit(bit, &(page)->private); \ +} while(0) + +#define PageNfsWriting (page) PageNfsBit(NFS_PAGE_WRITING, (page)) +#define SetPageNfsWriting (page) SetPageNfsBit(NFS_PAGE_WRITING, (page)) +#define ClearPageNfsWriting (page) ClearPageNfsBit(NFS_PAGE_WRITING, (page)) + +#define PageNfsCached (page) PageNfsBit(NFS_PAGE_CACHED, (page)) +#define SetPageNfsCached (page) SetPageNfsBit(NFS_PAGE_CACHED, (page)) +#define ClearPageNfsCached (page) ClearPageNfsBit(NFS_PAGE_CACHED, (page)) +struct nfs_string ;struct nfs_mount_data ;struct nfs4_mount_data ;
@@ -27,6 +51,11 @@ struct nfs_clone_mount {rpc_authflavor_t authflavor; }; +/* +* include filesystem caching stuff here +*/ +#include "fscache.h" +/* client.c */ extern struct rpc_program nfs_program;
@@ -150,6 +179,9 @@ extern int nfs4_path_walk(struct nfs_ser const char *path);#endif +/* read.c */ +extern int nfs_readpage_async (struct nfs_open_context *,struct inode *,struct page *); +/* * Determine the device name as a string */
fs/nfs/pagelist.c +2 -1
@@ -17,6 +17,7 @@ #include <linux/nfs4.h>#include <linux/nfs_page.h> #include <linux/nfs_fs.h> #include <linux/nfs_mount.h> +#include "internal.h" #define NFS_PARANOIA 1
@@ -84,7 +85,7 @@ nfs_create_request(struct nfs_open_conteatomic_set (&req->wb_complete,0 ); req->wb_index = page->index;page_cache_get (page); -BUG_ON (PagePrivate (page)); +BUG_ON (PageNfsWriting (page));BUG_ON (!PageLocked (page));BUG_ON (page->mapping->host != inode); req->wb_offset = offset;
fs/nfs/read.c +29 -1
@@ -26,11 +26,13 @@ #include <linux/pagemap.h>#include <linux/sunrpc/clnt.h> #include <linux/nfs_fs.h> #include <linux/nfs_page.h> +#include <linux/nfs_mount.h> #include <linux/smp_lock.h> #include <asm/system.h> #include "iostat.h" +#include "internal.h" #define NFSDBG_FACILITY NFSDBG_PAGECACHE
@@ -200,13 +202,18 @@ static int nfs_readpage_sync(struct nfs_SetPageUptodate (page); result =0 ; +nfs_readpage_to_fscache (inode, page,1 ); +unlock_page (page); + +return result; + io_error:unlock_page (page);nfs_readdata_free (rdata);return result; } -static int nfs_readpage_async (struct nfs_open_context *ctx,struct inode *inode, +int nfs_readpage_async (struct nfs_open_context *ctx,struct inode *inode,struct page *page) {LIST_HEAD (one_request);
@@ -231,6 +238,11 @@ static int nfs_readpage_async(struct nfsstatic void nfs_readpage_release (struct nfs_page *req) { +struct inode *d_inode = req->wb_context->dentry->d_inode; + +if (PageUptodate (req->wb_page)) +nfs_readpage_to_fscache (d_inode, req->wb_page,0 ); +unlock_page (req->wb_page); dprintk("NFS: read done (%s/%Ld %d@%Ld)\n",
@@ -613,6 +625,10 @@ int nfs_readpage(struct file *file, stru ctx =get_nfs_open_context ((struct nfs_open_context *) file->private_data);if (!IS_SYNC (inode)) { + error =nfs_readpage_from_fscache (ctx, inode, page); +if (error ==0 ) + goto out; + error =nfs_readpage_async (ctx, inode, page); goto out; }
@@ -643,6 +659,7 @@ readpage_async_filler(void *data, structunsigned int len;nfs_wb_page (inode, page); + len =nfs_page_length (inode, page);if (len ==0 )return nfs_return_empty_page (page);
@@ -682,6 +699,17 @@ int nfs_readpages(struct file *filp, str }else desc.ctx =get_nfs_open_context ((struct nfs_open_context *) filp->private_data); + +/* attempt to read as many of the pages as possible from the cache +* - this returns -ENOBUFS immediately if the cookie is negative +*/ + ret =nfs_readpages_from_fscache (desc.ctx, inode, mapping, + pages, &nr_pages); +if (ret ==0 ) { +put_nfs_open_context (desc.ctx); +return ret;/* all read */ + } + ret =read_cache_pages (mapping, pages, readpage_async_filler, &desc);if (!list_empty (&head)) {int err =nfs_pagein_list (&head, server->rpages);
fs/nfs/super.c +1 -0
@@ -286,6 +286,7 @@ static void nfs_show_mount_options(struc { NFS_MOUNT_NOAC, ",noac", "" }, { NFS_MOUNT_NONLM, ",nolock", "" }, { NFS_MOUNT_NOACL, ",noacl", "" }, + { NFS_MOUNT_FSCACHE, ",fsc", "" }, { 0, NULL, NULL } };const struct proc_nfs_info *nfs_infop;
fs/nfs/sysctl.c +43 -0
55 lines not on this page · raw message
fs/nfs/write.c +9 -2
@@ -63,6 +63,7 @@ #include <linux/smp_lock.h>#include "delegation.h" #include "iostat.h" +#include "internal.h" #define NFSDBG_FACILITY NFSDBG_PAGECACHE
@@ -163,6 +164,9 @@ static void nfs_grow_file(struct page *preturn ;nfs_inc_stats (inode,NFSIOS_EXTENDWRITE );i_size_write (inode, end); +#ifdef FSCACHE_WRITE_SUPPORT +nfs_set_fscsize (NFS_SERVER (inode),NFS_I (inode), end); +#endif }/* We can set the PG_uptodate flag if we see that a write request
@@ -342,6 +346,9 @@ do_it: err = -EBADF ; goto out; } + +nfs_writepage_to_fscache (inode, page); +lock_kernel ();if (!IS_SYNC (inode) && inode_referenced) { err =nfs_writepage_async (ctx, inode, page,0 , offset);
@@ -424,7 +431,7 @@ static int nfs_inode_add_request(structif (nfs_have_delegation (inode,FMODE_WRITE )) nfsi->change_attr++; } -SetPagePrivate (req->wb_page); +SetPageNfsWriting (req->wb_page); nfsi->npages++;atomic_inc (&req->wb_count);return 0 ;
@@ -441,7 +448,7 @@ static void nfs_inode_remove_request(strBUG_ON (!NFS_WBACK_BUSY (req));spin_lock (&nfsi->req_lock); -ClearPagePrivate (req->wb_page); +ClearPageNfsWriting (req->wb_page);radix_tree_delete (&nfsi->nfs_page_tree, req->wb_index); nfsi->npages--;if (!nfsi->npages) {
include/linux/nfs4_mount.h +1 -0
@@ -65,6 +65,7 @@ #define NFS4_MOUNT_INTR 0x0002 /* 1 */#define NFS4_MOUNT_NOCTO 0x0010/* 1 */ #define NFS4_MOUNT_NOAC 0x0020/* 1 */ #define NFS4_MOUNT_STRICTLOCK 0x1000/* 1 */ +#define NFS4_MOUNT_FSCACHE 0x4000/* 1 */ #define NFS4_MOUNT_FLAGMASK 0xFFFF#endif
include/linux/nfs_fs.h +5 -0
@@ -29,6 +29,7 @@ #include <linux/nfs_fs_sb.h>#include <linux/rwsem.h> #include <linux/mempool.h> +#include <linux/fscache.h> /* * Enable debugging support for nfs client.
@@ -180,6 +181,9 @@ #ifdef CONFIG_NFS_V4int delegation_state;struct rw_semaphore rwsem;#endif /* CONFIG_NFS_V4*/ +#ifdef CONFIG_NFS_FSCACHE +struct fscache_cookie *fscache; +#endif struct inode vfs_inode; };
@@ -582,6 +586,7 @@ #define NFSDBG_FILE 0x0040#define NFSDBG_ROOT 0x0080#define NFSDBG_CALLBACK 0x0100#define NFSDBG_CLIENT 0x0200 +#define NFSDBG_FSCACHE 0x0400#define NFSDBG_ALL 0xFFFF#ifdef __KERNEL__
include/linux/nfs_fs_sb.h +5 -0
@@ -3,6 +3,7 @@ #define _NFS_FS_SB#include <linux/list.h> #include <linux/backing-dev.h> +#include <linux/fscache.h> struct nfs_iostats ;
@@ -66,6 +67,10 @@ #ifdef CONFIG_NFS_V4char cl_ipaddr[16 ];unsigned char cl_id_uniquifier;#endif + +#ifdef CONFIG_NFS_FSCACHE +struct fscache_cookie *fscache;/* client index cache cookie */ +#endif };/*
include/linux/nfs_mount.h +1 -0
@@ -61,6 +61,7 @@ #define NFS_MOUNT_BROKEN_SUID 0x0400 /*#define NFS_MOUNT_NOACL 0x0800/* 4 */ #define NFS_MOUNT_STRICTLOCK 0x1000/* reserved for NFSv4 */ #define NFS_MOUNT_SECFLAVOUR 0x2000/* 5 */ +#define NFS_MOUNT_FSCACHE 0x4000#define NFS_MOUNT_FLAGMASK 0xFFFF#endif
David Howells
maintainerPATCH 27/30 FS-Cache: CacheFiles: ia64: missing copy_page export [try #11]
In reply to David HowellsThis one-line patch fixes the missing export of copy_page introduced by the cachefile patches. This patch is not yet upstream, but is required for cachefile on ia64. It will be pushed upstream when cachefile goes upstream.
---
arch/ia64/kernel/ia64_ksyms.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
arch/ia64/kernel/ia64_ksyms.c +1 -0
@@ -42,6 +42,7 @@ EXPORT_SYMBOL(__do_clear_user);EXPORT_SYMBOL (__strlen_user);EXPORT_SYMBOL (__strncpy_from_user);EXPORT_SYMBOL (__strnlen_user); +EXPORT_SYMBOL (copy_page);/* from arch/ia64/lib */ extern void __divsi3 (void );
David Howells
maintainerPATCH 28/30 FS-Cache: CacheFiles: A cache that backs onto a mounted filesystem [try #11]
In reply to David HowellsAdd a cache backend that permits a mounted filesystem to be used as a backing store for the cache.
CacheFiles uses a userspace daemon to do some of the cache management - such as reaping stale nodes and culling. This is called cachefilesd and lives in /sbin. The source for the daemon can be downloaded from:
http://people.redhat.com/~dhowells/cachefs/cachefilesd.c
And an example configuration from:
http://people.redhat.com/~dhowells/cachefs/cachefilesd.conf
The filesystem and data integrity of the cache are only as good as those of the filesystem providing the backing services. Note that CacheFiles does not attempt to journal anything since the journalling interfaces of the various filesystems are very specific in nature.
CacheFiles creates a proc-file - "/proc/fs/cachefiles" - that is used for communication with the daemon. Only one thing may have this open at once, and whilst it is open, a cache is at least partially in existence. The daemon opens this and sends commands down it to control the cache.
CacheFiles is currently limited to a single cache.
CacheFiles attempts to maintain at least a certain percentage of free space on the filesystem, shrinking the cache by culling the objects it contains to make space if necessary - see the "Cache Culling" section. This means it can be placed on the same medium as a live set of data, and will expand to make use of spare space and automatically contract when the set of data requires more space.
Further changes [try #11] that have been made:
(*) Make the calls to the statfs() superblock op supply a dentry not a
vfsmount.
(*) CONFIG_CACHEFILES_DEBUG permits _enter(), _debug() and _exit() to be
enabled dynamically.
(*) debugging macros are checked by gcc for printf format compliance even when
completely disabled.
============
REQUIREMENTS
============
The use of CacheFiles and its daemon requires the following features to be available in the system and in the cache filesystem:
- dnotify.
- extended attributes (xattrs).
- openat() and friends.
- bmap() support on files in the filesystem (FIBMAP ioctl).
- The use of bmap() to detect a partial page at the end of the file.
It is strongly recommended that the "dir_index" option is enabled on Ext3 filesystems being used as a cache.
=============
CONFIGURATION
=============
The cache is configured by a script in /etc/cachefilesd.conf. These commands set up cache ready for use. The following script commands are available:
(*) brun <N>%
(*) bcull <N>%
(*) bstop <N>%
Configure the culling limits. Optional. See the section on culling The defaults are 7%, 5% and 1% respectively.
(*) dir <path>
Specify the directory containing the root of the cache. Mandatory.
(*) tag <name>
Specify a tag to FS-Cache to use in distinguishing multiple caches. Optional. The default is "CacheFiles".
(*) debug <mask>
Specify a numeric bitmask to control debugging in the kernel module. Optional. The default is zero (all off).
==================
STARTING THE CACHE
==================
The cache is started by running the daemon. The daemon opens the cache proc file, configures the cache and tells it to begin caching. At that point the cache binds to fscache and the cache becomes live.
The daemon is run as follows:
/sbin/cachefilesd [-d]* [-s] [-n] [-f <configfile>]
The flags are:
(*) -d
Increase the debugging level. This can be specified multiple times and is cumulative with itself.
(*) -s
Send messages to stderr instead of syslog.
(*) -n
Don't daemonise and go into background.
(*) -f <configfile>
Use an alternative configuration file rather than the default one.
===============
THINGS TO AVOID
===============
Do not mount other things within the cache as this will cause problems. The kernel module contains its own very cut-down path walking facility that ignores mountpoints, but the daemon can't avoid them.
Do not create, rename or unlink files and directories in the cache whilst the cache is active, as this may cause the state to become uncertain.
Renaming files in the cache might make objects appear to be other objects (the filename is part of the lookup key).
Do not change or remove the extended attributes attached to cache files by the cache as this will cause the cache state management to get confused.
Do not create files or directories in the cache, lest the cache get confused or serve incorrect data.
Do not chmod files in the cache. The module creates things with minimal permissions to prevent random users being able to access them directly.
=============
CACHE CULLING
=============
The cache may need culling occasionally to make space. This involves discarding objects from the cache that have been used less recently than anything else. Culling is based on the access time of data objects. Empty directories are culled if not in use.
Cache culling is done on the basis of the percentage of blocks available in the underlying filesystem. There are three "limits":
(*) brun
If the amount of available space in the cache rises above this limit, then culling is turned off.
(*) bcull
If the amount of available space in the cache falls below this limit, then culling is started.
(*) bstop
If the amount of available space in the cache falls below this limit, then no further allocation of disk space is permitted until culling has raised the amount above this limit again.
These must be configured thusly:
0 <= bstop < bcull < brun < 100
Note that these are percentages of available space, and do _not_ appear as 100 minus the percentage displayed by the "df" program.
The userspace daemon scans the cache to build up a table of cullable objects. These are then culled in least recently used order. A new scan of the cache is started as soon as space is made in the table. Objects will be skipped if their atimes have changed or if the kernel module says it is still using them.
===============
CACHE STRUCTURE
===============
The CacheFiles module will create two directories in the directory it was given:
(*) cache/
(*) graveyard/
The active cache objects all reside in the first directory. The CacheFiles kernel module moves any retired or culled objects that it can't simply unlink to the graveyard from which the daemon will actually delete them.
The daemon uses dnotify to monitor the graveyard directory, and will delete anything that appears therein.
The module represents index objects as directories with the filename "I..." or "J...". Note that the "cache/" directory is itself a special index.
Data objects are represented as files if they have no children, or directories if they do. Their filenames all begin "D..." or "E...". If represented as a directory, data objects will have a file in the directory called "data" that actually holds the data.
Special objects are similar to data objects, except their filenames begin "S..." or "T...".
If an object has children, then it will be represented as a directory. Immediately in the representative directory are a collection of directories named for hash values of the child object keys with an '@' prepended. Into this directory, if possible, will be placed the representations of the child objects:
INDEX INDEX INDEX DATA FILES ========= ========== ================================= ================ cache/@4a/I03nfs/@30/Ji000000000000000--fHg8hi8400 cache/@4a/I03nfs/@30/Ji000000000000000--fHg8hi8400/@75/Es0g000w...DB1ry cache/@4a/I03nfs/@30/Ji000000000000000--fHg8hi8400/@75/Es0g000w...N22ry cache/@4a/I03nfs/@30/Ji000000000000000--fHg8hi8400/@75/Es0g000w...FP1ry
If the key is so long that it exceeds NAME_MAX with the decorations added on to it, then it will be cut into pieces, the first few of which will be used to make a nest of directories, and the last one of which will be the objects inside the last directory. The names of the intermediate directories will have '+' prepended:
J1223/@23/+xy...z/+kl...m/Epqr
Note that keys are raw data, and not only may they exceed NAME_MAX in size, they may also contain things like '/' and NUL characters, and so they may not be suitable for turning directly into a filename.
To handle this, CacheFiles will use a suitably printable filename directly and "base-64" encode ones that aren't directly suitable. The two versions of object filenames indicate the encoding:
OBJECT TYPE PRINTABLE ENCODED =============== =============== =============== Index "I..." "J..." Data "D..." "E..." Special "S..." "T..."
Intermediate directories are always "@" or "+" as appropriate.
Each object in the cache has an extended attribute label that holds the object type ID (required to distinguish special objects) and the auxiliary data from the netfs. The latter is used to detect stale objects in the cache and update or retire them.
Note that CacheFiles will erase from the cache any file it doesn't recognise or any file of an incorrect type (such as a FIFO file or a device file).
This documentation is added by the patch to:
Documentation/filesystems/caching/cachefiles.txt
---
Documentation/filesystems/caching/cachefiles.txt | 281 +++++ fs/Kconfig | 20 fs/Makefile | 1 fs/buffer.c | 2 fs/cachefiles/Makefile | 18 fs/cachefiles/cf-bind.c | 279 +++++ fs/cachefiles/cf-interface.c | 1299 ++++++++++++++++++++++ fs/cachefiles/cf-key.c | 157 +++ fs/cachefiles/cf-main.c | 129 ++ fs/cachefiles/cf-namei.c | 825 ++++++++++++++ fs/cachefiles/cf-proc.c | 498 ++++++++ fs/cachefiles/cf-sysctl.c | 69 + fs/cachefiles/cf-xattr.c | 295 +++++ fs/cachefiles/internal.h | 308 +++++ fs/fcntl.c | 2 fs/file_table.c | 1 include/linux/fs.h | 2 include/linux/pagemap.h | 6 kernel/auditsc.c | 2 mm/filemap.c | 98 ++ 20 files changed, 4292 insertions(+), 0 deletions(-)
Documentation/filesystems/caching/cachefiles.txt new file +281 -0
@@ -0,0 +1,281 @@ + =============================================== + CacheFiles: CACHE ON ALREADY MOUNTED FILESYSTEM + =============================================== + +Contents: + + (*) Overview. + + (*) Requirements. + + (*) Configuration. + + (*) Starting the cache. + + (*) Things to avoid. + + +======== +OVERVIEW +======== + +CacheFiles is a caching backend that's meant to use as a cache a directory on +an already mounted filesystem of a local type (such as Ext3). + +CacheFiles uses a userspace daemon to do some of the cache management - such as +reaping stale nodes and culling. This is called cachefilesd and lives in +/sbin. + +The filesystem and data integrity of the cache are only as good as those of the +filesystem providing the backing services. Note that CacheFiles does not +attempt to journal anything since the journalling interfaces of the various +filesystems are very specific in nature. + +CacheFiles creates a proc-file - "/proc/fs/cachefiles" - that is used for +communication with the daemon. Only one thing may have this open at once, and +whilst it is open, a cache is at least partially in existence. The daemon +opens this and sends commands down it to control the cache. + +CacheFiles is currently limited to a single cache. + +CacheFiles attempts to maintain at least a certain percentage of free space on +the filesystem, shrinking the cache by culling the objects it contains to make +space if necessary - see the "Cache Culling" section. This means it can be +placed on the same medium as a live set of data, and will expand to make use of +spare space and automatically contract when the set of data requires more +space. + + +============ +REQUIREMENTS +============ + +The use of CacheFiles and its daemon requires the following features to be +available in the system and in the cache filesystem: + + - dnotify. + + - extended attributes (xattrs). + + - openat() and friends. + + - bmap() support on files in the filesystem (FIBMAP ioctl). + + - The use of bmap() to detect a partial page at the end of the file. + +It is strongly recommended that the "dir_index" option is enabled on Ext3 +filesystems being used as a cache. + + +============= +CONFIGURATION +============= + +The cache is configured by a script in /etc/cachefilesd.conf. These commands +set up cache ready for use. The following script commands are available: + + (*) brun <N>% + (*) bcull <N>% + (*) bstop <N>% + + Configure the culling limits. Optional. See the section on culling + The defaults are 7%, 5% and 1% respectively. + + (*) dir <path> + + Specify the directory containing the root of the cache. Mandatory. + + (*) tag <name> + + Specify a tag to FS-Cache to use in distinguishing multiple caches. + Optional. The default is "CacheFiles". + + (*) debug <mask> + + Specify a numeric bitmask to control debugging in the kernel module. + Optional. The default is zero (all off). The following values can be + OR'd into the mask to collect various information: + + 1 Turn on trace of function entry (_enter() macros) + 2 Turn on trace of function exit (_leave() macros) + 4 Turn on trace of internal debug points (_debug()) + + This mask can also be set through /proc/sys/fs/cachefiles/debug. + + +================== +STARTING THE CACHE +================== + +The cache is started by running the daemon. The daemon opens the cache proc +file, configures the cache and tells it to begin caching. At that point the +cache binds to fscache and the cache becomes live. + +The daemon is run as follows: + + /sbin/cachefilesd [-d]* [-s] [-n] [-f <configfile>] + +The flags are: + + (*) -d + + Increase the debugging level. This can be specified multiple times and + is cumulative with itself. + + (*) -s + + Send messages to stderr instead of syslog. + + (*) -n + + Don't daemonise and go into background. + + (*) -f <configfile> + + Use an alternative configuration file rather than the default one. + + +=============== +THINGS TO AVOID +=============== + +Do not mount other things within the cache as this will cause problems. The +kernel module contains its own very cut-down path walking facility that ignores +mountpoints, but the daemon can't avoid them. + +Do not create, rename or unlink files and directories in the cache whilst the +cache is active, as this may cause the state to become uncertain. + +Renaming files in the cache might make objects appear to be other objects (the +filename is part of the lookup key). + +Do not change or remove the extended attributes attached to cache files by the +cache as this will cause the cache state management to get confused. + +Do not create files or directories in the cache, lest the cache get confused or +serve incorrect data. + +Do not chmod files in the cache. The module creates things with minimal +permissions to prevent random users being able to access them directly. + + +============= +CACHE CULLING +============= + +The cache may need culling occasionally to make space. This involves +discarding objects from the cache that have been used less recently than +anything else. Culling is based on the access time of data objects. Empty +directories are culled if not in use. + +Cache culling is done on the basis of the percentage of blocks available in the +underlying filesystem. There are three "limits": + + (*) brun + + If the amount of available space in the cache rises above this limit, then + culling is turned off. + + (*) bcull + + If the amount of available space in the cache falls below this limit, then + culling is started. + + (*) bstop + + If the amount of available space in the cache falls below this limit, then + no further allocation of disk space is permitted until culling has raised + the amount above this limit again. + +These must be configured thusly: + + 0 <= bstop < bcull < brun < 100 + +Note that these are percentages of available space, and do _not_ appear as 100 +minus the percentage displayed by the "df" program. + +The userspace daemon scans the cache to build up a table of cullable objects. +These are then culled in least recently used order. A new scan of the cache is +started as soon as space is made in the table. Objects will be skipped if +their atimes have changed or if the kernel module says it is still using them. + + +=============== +CACHE STRUCTURE +=============== + +The CacheFiles module will create two directories in the directory it was +given: + + (*) cache/ + + (*) graveyard/ + +The active cache objects all reside in the first directory. The CacheFiles +kernel module moves any retired or culled objects that it can't simply unlink +to the graveyard from which the daemon will actually delete them. + +The daemon uses dnotify to monitor the graveyard directory, and will delete +anything that appears therein. + + +The module represents index objects as directories with the filename "I..." or +"J...". Note that the "cache/" directory is itself a special index. + +Data objects are represented as files if they have no children, or directories +if they do. Their filenames all begin "D..." or "E...". If represented as a +directory, data objects will have a file in the directory called "data" that +actually holds the data. + +Special objects are similar to data objects, except their filenames begin +"S..." or "T...". + + +If an object has children, then it will be represented as a directory. +Immediately in the representative directory are a collection of directories +named for hash values of the child object keys with an '@' prepended. Into +this directory, if possible, will be placed the representations of the child +objects: + + INDEX INDEX INDEX DATA FILES + ========= ========== ================================= ================ + cache/@4a/I03nfs/@30/Ji000000000000000--fHg8hi8400 + cache/@4a/I03nfs/@30/Ji000000000000000--fHg8hi8400/@75/Es0g000w...DB1ry + cache/@4a/I03nfs/@30/Ji000000000000000--fHg8hi8400/@75/Es0g000w...N22ry + cache/@4a/I03nfs/@30/Ji000000000000000--fHg8hi8400/@75/Es0g000w...FP1ry + + +If the key is so long that it exceeds NAME_MAX with the decorations added on to +it, then it will be cut into pieces, the first few of which will be used to +make a nest of directories, and the last one of which will be the objects +inside the last directory. The names of the intermediate directories will have +'+' prepended: + + J1223/@23/+xy...z/+kl...m/Epqr + + +Note that keys are raw data, and not only may they exceed NAME_MAX in size, +they may also contain things like '/' and NUL characters, and so they may not +be suitable for turning directly into a filename. + +To handle this, CacheFiles will use a suitably printable filename directly and +"base-64" encode ones that aren't directly suitable. The two versions of +object filenames indicate the encoding: + + OBJECT TYPE PRINTABLE ENCODED + =============== =============== =============== + Index "I..." "J..." + Data "D..." "E..." + Special "S..." "T..." + +Intermediate directories are always "@" or "+" as appropriate. + + +Each object in the cache has an extended attribute label that holds the object +type ID (required to distinguish special objects) and the auxiliary data from +the netfs. The latter is used to detect stale objects in the cache and update +or retire them. + + +Note that CacheFiles will erase from the cache any file it doesn't recognise or +any file of an incorrect type (such as a FIFO file or a device file).
fs/Kconfig +20 -0
@@ -543,6 +543,26 @@ config FSCACHE See Documentation/filesystems/caching/fscache.txt for more information. +config CACHEFILES + tristate "Filesystem caching on files" + depends on FSCACHE + help + This permits use of a mounted filesystem as a cache for other + filesystems - primarily networking filesystems - thus allowing fast + local disk to enhance the speed of slower devices. + + See Documentation/filesystems/caching/cachefiles.txt for more + information. + +config CACHEFILES_DEBUG + bool "Debug CacheFiles" + depends on CACHEFILES + help + This permits debugging to be dynamically enabled in the filesystem + caching on files module. If this is set, the debugging output may be + enabled by setting bits in /proc/sys/fs/cachefiles/debug or by + including a debugging specifier in /etc/cachefilesd.conf. + endmenu menu "CD-ROM/DVD Filesystems"
fs/Makefile +1 -0
@@ -101,5 +101,6 @@ obj-$(CONFIG_AFS_FS) += afs/ obj-$(CONFIG_BEFS_FS) += befs/ obj-$(CONFIG_HOSTFS) += hostfs/ obj-$(CONFIG_HPPFS) += hppfs/ +obj-$(CONFIG_CACHEFILES) += cachefiles/ obj-$(CONFIG_DEBUG_FS) += debugfs/ obj-$(CONFIG_OCFS2_FS) += ocfs2/
fs/buffer.c +2 -0
@@ -184,6 +184,8 @@ int fsync_super(struct super_block *sb)return sync_blockdev (sb->s_bdev); } +EXPORT_SYMBOL (fsync_super); +/* * Write out and wait upon all dirty data associated with this * device. Filesystem data as well as the underlying block
fs/cachefiles/Makefile new file +18 -0
@@ -0,0 +1,18 @@ +# +# Makefile for caching in a mounted filesystem +# + +cachefiles-objs := \ + cf-bind.o \ + cf-interface.o \ + cf-key.o \ + cf-main.o \ + cf-namei.o \ + cf-proc.o \ + cf-xattr.o + +ifeq ($(CONFIG_SYSCTL),y) +cachefiles-objs += cf-sysctl.o +endif + +obj-$(CONFIG_CACHEFILES) := cachefiles.o
fs/cachefiles/cf-bind.c new file +279 -0
279 lines not on this page · raw message
fs/cachefiles/cf-interface.c new file +1299 -0
1,299 lines not on this page · raw message
fs/cachefiles/cf-key.c new file +157 -0
157 lines not on this page · raw message
fs/cachefiles/cf-main.c new file +129 -0
129 lines not on this page · raw message
fs/cachefiles/cf-namei.c new file +825 -0
797 lines not on this page · raw message
fs/cachefiles/cf-proc.c new file +498 -0
498 lines not on this page · raw message
fs/cachefiles/cf-sysctl.c new file +69 -0
69 lines not on this page · raw message
fs/cachefiles/cf-xattr.c new file +295 -0
295 lines not on this page · raw message
fs/cachefiles/internal.h new file +308 -0
308 lines not on this page · raw message
mm/filemap.c +98 -0
98 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.
David Howells
maintainerPATCH 29/30 AUTOFS: Make sure all dentries refs are released before calling kill_anon_super() [try #11]
In reply to David HowellsMake sure all dentries refs are released before calling kill_anon_super() so that the assumption that generic_shutdown_super() can completely destroy the dentry tree for there will be no external references holds true.
What was being done in the put_super() superblock op, is now done in the kill_sb() filesystem op instead, prior to calling kill_anon_super().
This makes the struct autofs_sb_info::root member variable redundant (since sb->s_root is still available), and so that is removed. The calls to shrink_dcache_sb() are also removed since they're also redundant as shrink_dcache_for_umount() will now be called after the cleanup routine.
---
fs/autofs4/autofs_i.h | 3 +-- fs/autofs4/init.c | 2 +- fs/autofs4/inode.c | 22 ++++------------------ fs/autofs4/waitq.c | 1 - 4 files changed, 6 insertions(+), 22 deletions(-)
fs/autofs4/autofs_i.h +1 -2
@@ -96,7 +96,6 @@ #define AUTOFS_TYPE_OFFSET 0x0004struct autofs_sb_info {u32 magic; -struct dentry *root;int pipefd;struct file *pipe;pid_t oz_pgrp;
@@ -231,4 +230,4 @@ out: }void autofs4_dentry_release (struct dentry *); - +extern void autofs4_kill_sb (struct super_block *);
fs/autofs4/init.c +1 -1
@@ -24,7 +24,7 @@ static struct file_system_type autofs_fs .owner = THIS_MODULE, .name = "autofs", .get_sb = autofs_get_sb, - .kill_sb = kill_anon_super, + .kill_sb = autofs4_kill_sb, };static int __init init_autofs4_fs (void )
fs/autofs4/inode.c +4 -18
@@ -95,7 +95,7 @@ void autofs4_free_ino(struct autofs_info*/ static void autofs4_force_release (struct autofs_sb_info *sbi) { -struct dentry *this_parent = sbi->root; +struct dentry *this_parent = sbi->sb->s_root;struct list_head *next;spin_lock (&dcache_lock);
@@ -126,7 +126,7 @@ resume:spin_lock (&dcache_lock); } -if (this_parent != sbi->root) { +if (this_parent != sbi->sb->s_root) {struct dentry *dentry = this_parent; next = this_parent->d_u.d_child.next;
@@ -139,15 +139,9 @@ resume: goto resume; }spin_unlock (&dcache_lock); - -dput (sbi->root); - sbi->root =NULL ; -shrink_dcache_sb (sbi->sb); - -return ; } -static void autofs4_put_super (struct super_block *sb) +void autofs4_kill_sb (struct super_block *sb) {struct autofs_sb_info *sbi =autofs4_sbi (sb);
@@ -162,6 +156,7 @@ static void autofs4_put_super(struct supkfree (sbi);DPRINTK ("shutting down" ); +kill_anon_super (sb); }static int autofs4_show_options (struct seq_file *m,struct vfsmount *mnt)
@@ -188,7 +183,6 @@ static int autofs4_show_options(struct s }static struct super_operations autofs4_sops = { - .put_super = autofs4_put_super, .statfs = simple_statfs, .show_options = autofs4_show_options, };
@@ -314,7 +308,6 @@ int autofs4_fill_super(struct super_bloc s->s_fs_info = sbi; sbi->magic =AUTOFS_SBI_MAGIC ; - sbi->root =NULL ; sbi->pipefd =-1 ; sbi->catatonic =0 ; sbi->exp_timeout =0 ;
@@ -396,13 +389,6 @@ int autofs4_fill_super(struct super_bloc sbi->pipefd = pipefd;/* -* Take a reference to the root dentry so we get a chance to -* clean up the dentry tree on umount. -* See autofs4_force_release. -*/ - sbi->root =dget (root); - -/* * Success! Install the root dentry now to indicate completion. */ s->s_root = root;
fs/autofs4/waitq.c +0 -1
@@ -45,7 +45,6 @@ void autofs4_catatonic_mode(struct autoffput (sbi->pipe);/* Close the pipe */ sbi->pipe =NULL ; } -shrink_dcache_sb (sbi->sb); }static int autofs4_write (struct file *file,const void *addr,int bytes)
David Howells
maintainerPATCH 30/30 VFS: Destroy the dentries contributed by a superblock on unmounting [try #11]
In reply to David HowellsThe attached patch destroys all the dentries attached to a superblock in one go by:
(1) Destroying the tree rooted at s_root.
(2) Destroying every entry in the anon list, one at a time.
(3) Each entry in the anon list has its subtree consumed from the leaves inwards.
This reduces the amount of work generic_shutdown_super() does, and avoids iterating through the dentry_unused list.
Note that locking is almost entirely absent in the shrink_dcache_for_umount*() functions added by this patch. This is because:
(1) at the point the filesystem calls generic_shutdown_super(), it is not permitted to further touch the superblock's set of dentries, and nor may it remove aliases from inodes;
(2) the dcache memory shrinker now skips dentries that are being unmounted; and
(3) the superblock no longer has any external references through which the VFS can reach it.
Given these points, the only locking we need to do is when we remove dentries from the unused list and the name hashes, which we do a directory's worth at a time.
We also don't need to guard against reference counts going to zero unexpectedly and removing bits of the tree we're working on as nothing else can call dput().
A cut down version of dentry_iput() has been folded into shrink_dcache_for_umount_subtree() function. Apart from not needing to unlock things, it also doesn't need to check for inotify watches.
In this version of the patch, the complaint about a dentry still being in use has been expanded from a single BUG_ON() and now gives much more information.
---
fs/dcache.c | 133 ++++++++++++++++++++++++++++++++++++++++++++++++ fs/super.c | 12 ++-- include/linux/dcache.h | 1 3 files changed, 140 insertions(+), 6 deletions(-)
fs/dcache.c +133 -0
@@ -547,6 +547,139 @@ repeat: }/* +* destroy a single subtree of dentries for unmount +* - see the comments on shrink_dcache_for_umount() for a description of the +* locking +*/ +static void shrink_dcache_for_umount_subtree (struct dentry *dentry) +{ +struct dentry *parent; + +BUG_ON (!IS_ROOT (dentry)); + +/* detach this root from the system */ +spin_lock (&dcache_lock); +if (!list_empty (&dentry->d_lru)) { + dentry_stat.nr_unused--; +list_del_init (&dentry->d_lru); + } +__d_drop (dentry); +spin_unlock (&dcache_lock); + +for (;;) { +/* descend to the first leaf in the current subtree */ +while (!list_empty (&dentry->d_subdirs)) { +struct dentry *loop; + +/* this is a branch with children - detach all of them +* from the system in one go */ +spin_lock (&dcache_lock); +list_for_each_entry (loop, &dentry->d_subdirs, + d_u.d_child) { +if (!list_empty (&loop->d_lru)) { + dentry_stat.nr_unused--; +list_del_init (&loop->d_lru); + } + +__d_drop (loop); +cond_resched_lock (&dcache_lock); + } +spin_unlock (&dcache_lock); + +/* move to the first child */ + dentry =list_entry (dentry->d_subdirs.next, + struct dentry, d_u.d_child); + } + +/* consume the dentries from this leaf up through its parents +* until we find one with children or run out altogether */ +do { +struct inode *inode; + +if (atomic_read (&dentry->d_count) !=0 ) { +printk (KERN_ERR +"BUG: Dentry %p{i=%lx,n=%s}" +" still in use (%d)" +" [unmount of %s %s]\n" , + dentry, + dentry->d_inode ? + dentry->d_inode->i_ino :0UL , + dentry->d_name.name, +atomic_read (&dentry->d_count), + dentry->d_sb->s_type->name, + dentry->d_sb->s_id); +BUG (); + } + + parent = dentry->d_parent; +if (parent == dentry) + parent =NULL ; +else +atomic_dec (&parent->d_count); + +list_del (&dentry->d_u.d_child); + dentry_stat.nr_dentry--;/* For d_free, below */ + + inode = dentry->d_inode; +if (inode) { +#ifdef CONFIG_INOTIFY +BUG_ON (!list_empty (&inode->inotify_watches)); +#endif + dentry->d_inode =NULL ; +list_del_init (&dentry->d_alias); +if (dentry->d_op && dentry->d_op->d_iput) + dentry->d_op->d_iput (dentry, inode); +else +iput (inode); + } + +d_free (dentry); + +/* finished when we fall off the top of the tree, +* otherwise we ascend to the parent and move to the +* next sibling if there is one */ +if (!parent) +return ; + + dentry = parent; + + }while (list_empty (&dentry->d_subdirs)); + + dentry =list_entry (dentry->d_subdirs.next, + struct dentry, d_u.d_child); + } +} + +/* +* destroy the dentries attached to a superblock on unmounting +* - we don't need to use dentry->d_lock, and only need dcache_lock when +* removing the dentry from the system lists and hashes because: +* - the superblock is detached from all mountings and open files, so the +* dentry trees will not be rearranged by the VFS +* - s_umount is write-locked, so the memory pressure shrinker will ignore +* any dentries belonging to this superblock that it comes across +* - the filesystem itself is no longer permitted to rearrange the dentries +* in this superblock +*/ +void shrink_dcache_for_umount (struct super_block *sb) +{ +struct dentry *dentry; + +if (down_read_trylock (&sb->s_umount)) +BUG (); + + dentry = sb->s_root; + sb->s_root =NULL ; +atomic_dec (&dentry->d_count); +shrink_dcache_for_umount_subtree (dentry); + +while (!hlist_empty (&sb->s_anon)) { + dentry = hlist_entry(sb->s_anon.first, struct dentry, d_hash); +shrink_dcache_for_umount_subtree (dentry); + } +} + +/* * Search for at least 1 mount point in the dentry's subdirs. * We descend to the next level whenever the d_subdirs * list is non-empty and continue searching.
fs/super.c +6 -6
@@ -228,17 +228,17 @@ static int grab_super(struct super_block* that need destruction out of superblock, call generic_shutdown_super() * and release aforementioned objects. Note: dentries and inodes _are_ * taken care of and do not need specific handling. +* +* Upon calling this function, the filesystem may no longer alter or +* rearrange the set of dentries belonging to this super_block, nor may it +* change the attachments of dentries to inodes. */ void generic_shutdown_super (struct super_block *sb) { -struct dentry *root = sb->s_root;struct super_operations *sop = sb->s_op; -if (root) { - sb->s_root =NULL ; -shrink_dcache_parent (root); -shrink_dcache_sb (sb); -dput (root); +if (sb->s_root) { +shrink_dcache_for_umount (sb);fsync_super (sb);lock_super (sb); sb->s_flags &= ~MS_ACTIVE ;
include/linux/dcache.h +1 -0
@@ -230,6 +230,7 @@ extern struct dentry * d_alloc_anon(struextern struct dentry *d_splice_alias (struct inode *,struct dentry *);extern void shrink_dcache_sb (struct super_block *);extern void shrink_dcache_parent (struct dentry *); +extern void shrink_dcache_for_umount (struct super_block *);extern int d_invalidate (struct dentry *);/* only used at mount-time */
Re: [PATCH 30/30] VFS: Destroy the dentries contributed by a superblock on unmounting [try #11]
include/linux/dcache.h extern struct dentry * d_alloc_anon(stru · line 236
Quoted 12 lines · David Howells
include/linux/dcache.h +1
-0@@ -230,6 +230,7 @@ extern struct dentry * d_alloc_anon(struextern struct dentry *d_splice_alias (struct inode *,struct dentry *);extern void shrink_dcache_sb (struct super_block *);extern void shrink_dcache_parent (struct dentry *); +extern void shrink_dcache_for_umount (struct super_block *);extern int d_invalidate (struct dentry *);/* only used at mount-time */
I don't see the point that we need two different versions of shrink_dcache_sb(). IMHO it is better to fix shrink_dcache_for_umount() so that it is a replacement for shrink_dcache_sb().
BTW: Talking about shrink_dcache_sb(): is it really necessary to call shrink_dcache_sb() when remounting a filesystem? The only reason I can see are changes to the lookup mechanism (hash algorithm etc) but a quick look into the different filesystems forbid the change of this options during remount.
Jan
David Howells
maintainerRe: [PATCH 30/30] VFS: Destroy the dentries contributed by a superblock on unmounting [try #11]
Quoted 2 lines · Jan Blunck
IMHO it is better to fix
shrink_dcache_for_umount()so that it is a replacement forshrink_dcache_sb().
The former may only be used when we *know* there aren't any references remaining to any of the dentries (as it severely reduces the amount of time spent holding the dcache_lock). The latter is used in situations in which the assumptions of the former don't hold true.
Now I could make the former hold the locking a lot more (I had a version of the patch that did that), but the former destroys all an sb's dentries, whether or not they're still in use (which they shouldn't be), and the latter does not.
The latter also doesn't reap the anon list directly; only where anon dentries are also unused does any anon reaping occur. The former reaps them directly and forcibly.
So, in conclusion, I don't think you can replace the latter with the former, and the latter is insufficiently complete to replace the former.
Quoted 5 lines
BTW: Talking about
shrink_dcache_sb(): is it really necessary to callshrink_dcache_sb()when remounting a filesystem? The only reason I can see are changes to the lookup mechanism (hash algorithm etc) but a quick look into the different filesystems forbid the change of this options during remount.
If you're just remounting, then not all dentries can necessarily be purged anyway - some of them may still be open. Consider remounting root for read-only or read-write...
David
Quoted 8 lines · David Howells
These patches make it possible to share NFS superblocks between related mounts, where "related" means on the same server and FSID. Inodes and dentries will be shared where the NFS filehandles are the same (for example if two NFS3 files come from the same export but from different mounts, such as is not uncommon with autofs on /home).
These patches also add local caching for network filesystems such as NFS and AFS.
I'm really looking forward to seeing this in the upstream kernel... thanks for your continued work on this.
(Although I admit to not reviewing 100% of the code)
Jeff
David Howells
maintainerFS-Cache patches
Quoted 4 lines · Jeff Garzik
I'm really looking forward to seeing this in the upstream kernel... thanks for your continued work on this.
(Although I admit to not reviewing 100% of the code)
Could you find some time to spare to review them? You can grab them from:
http://people.redhat.com/~dhowells/nfs/nfs+fscache-14.tar.bz2
Trond wants them to be reviewed by Christoph before accepting them, but I don't Christoph has the time. So if I could get someone else to review them instead, maybe that'd satisfy him.
David
Re: FS-Cache patches
Quoted 10 lines · David Howells
Quoted 4 lines · Jeff Garzik
I'm really looking forward to seeing this in the upstream kernel... thanks for your continued work on this.
(Although I admit to not reviewing 100% of the code)
Could you find some time to spare to review them? You can grab them from:
http://people.redhat.com/~dhowells/nfs/nfs+fscache-14.tar.bz2
Any reason the 64bit inode patches are included here?
04-fsmisc.diff:
ACK.
07-block-afs.diff:
ACK.
10-cachefiles-ia64.diff:
ACK.
12-autofs-dcache.diff:
ACK.
13-reiserfs-dcache.diff:
ACK.
14-dcache-crunch.diff:
ACK.
15-nfs-replace-null-dentries.diff:
ACK.
I'll take a look at the actual interesting patches ASAP. Could you please get all those simpler bits into -mm and resend everything else as a patch against -mm?
David Howells
maintainerRe: FS-Cache patches
Quoted 1 line · Christoph Hellwig
Any reason the 64bit inode patches are included here?
Sorry, that's just my complete NFS patchset that I use for waving in front of interesting parties. Various people know about that tarball and download it and play with it.
Feel free to ignore 1-3 and 12-16.
Quoted 3 lines
I'll take a look at the actual interesting patches ASAP. Could you please get all those simpler bits into -mm and resend everything else as a patch against -mm?
They're _all_ in -mm, I believe.
(*) Prerequisite AFS and NFS changes:
git-nfs.patch nfs-replace-null-dentries-that-appear-in-readdirs-list-2.patch afs-add-lock-annotations-to-afs_proc_cell_servers_startstop.patch
(*) General prerequisite stuff for AFS an NFS:
fs-cache-provide-a-filesystem-specific-syncable-page-bit.patch fs-cache-release-page-private-in-failed-readahead.patch fs-cache-release-page-private-after-failed-readahead-12.patch
(*) FS-Cache itself:
fs-cache-generic-filesystem-caching-facility.patch
(*) Make AFS use the cache:
fs-cache-make-kafs-use-fs-cache.patch fs-cache-make-kafs-use-fs-cache-fix.patch fs-cache-make-kafs-use-fs-cache-12.patch fs-cache-make-kafs-use-fs-cache-12-fix.patch fs-cache-make-kafs-use-fs-cache-vs-streamline-generic_file_-interfaces-and-filemap.patch
(*) Make NFS use the cache:
nfs-use-local-caching.patch
nfs-use-local-caching-12.patch
nfs-use-local-caching-12-fix.patch
(*) The CacheFiles cache backend:
fs-cache-cachefiles-a-cache-that-backs-onto-a-mounted-filesystem.patch fs-cache-cachefiles-a-cache-that-backs-onto-a-mounted-filesystem-cachefiles-printk-format-warning.patch fs-cache-cachefiles-a-cache-that-backs-onto-a-mounted-filesystem-warning-fixes.patch fs-cache-cachefiles-a-cache-that-backs-onto-a-mounted-filesystem-cachefiles-cachefiles_write_page-shouldnt-indicate-error-twice.patch fs-cache-cachefiles-a-cache-that-backs-onto-a-mounted-filesystem-cachefiles-handle-enospc-on-create-mkdir-better.patch fs-cache-cachefiles-a-cache-that-backs-onto-a-mounted-filesystem-inode-count-maintenance.patch
(*) Plus copy_page() exports:
add-missing-page_copy-export-for-ppc-and-powerpc.patch fs-cache-cachefiles-ia64-missing-copy_page-export.patch
(*) Plus 64-bit inode numbers:
vfs-make-filldir_t-and-struct-kstat-deal-in-64-bit-inode-numbers.patch vfs-make-filldir_t-and-struct-kstat-deal-in-64-bit-inode-numbers-alpha-fix.patch nfs-represent-64-bit-fileids-as-64-bit-inode-numbers-on-32-bit-systems.patch
(*) Plus dentry squishing:
autofs-make-sure-all-dentries-refs-are-released-before-calling-kill_anon_super.patch reiserfs-make-sure-all-dentries-refs-are-released-before-calling-kill_block_super-try-2.patch vfs-destroy-the-dentries-contributed-by-a-superblock-on-unmounting.patch
David
Quoted 5 lines · On Thu, 27 Jul 2006 21:52:22 +0100 David Howells <[email protected]> wrote:
These patches make it possible to share NFS superblocks between related mounts, where "related" means on the same server and FSID. Inodes and dentries will be shared where the NFS filehandles are the same (for example if two NFS3 files come from the same export but from different mounts, such as is not uncommon with autofs on /home).
It's not clear why these were sent. The first 25 patches are, as far as I can tell, already in Trond's tree. Whether Trond has the correct versions of these is now anybody's guess...
"[PATCH 26/30] NFS: Use local caching" appears to be the first patch which isn't in Trond's tree, but it doesn't work due to significant changes in nfs_clear_inode().
David Howells
maintainerQuoted 7 lines · Andrew Morton
Quoted 5 lines
These patches make it possible to share NFS superblocks between related mounts, where "related" means on the same server and FSID. Inodes and dentries will be shared where the NFS filehandles are the same (for example if two NFS3 files come from the same export but from different mounts, such as is not uncommon with autofs on /home).
It's not clear why these were sent.
To try and elicit some feedback.
Quoted 2 lines
The first 25 patches are, as far as I can tell, already in Trond's tree. Whether Trond has the correct versions of these is now anybody's guess...
He hasn't told me of any changes, but that doesn't mean he hasn't made any, I suppose.
Quoted 3 lines
"[PATCH 26/30] NFS: Use local caching" appears to be the first patch which isn't in Trond's tree, but it doesn't work due to significant changes in
nfs_clear_inode().
Hmmm...
David
Quoted 5 lines · David Howells
Quoted 2 lines
The first 25 patches are, as far as I can tell, already in Trond's tree. Whether Trond has the correct versions of these is now anybody's guess...
He hasn't told me of any changes, but that doesn't mean he hasn't made any, I suppose.
The only changes I made were to add a signed-off-by line. Unless you've made changes after we talked at OLS, then the patches should be identical.
Cheers,
Trond