- 10 Mar, 2005 40 commits
-
-
Neil Brown authored
The st_vfs_file pointer is set when the open that originally got the delegation is closed, and then in release_deleg we attempt to distinguish between the case when the original open has been closed and when it hasn't. The resulting logic is complicated and buggy. It's much simpler just to keep a reference count on the struct file. Signed-off-by:
J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by:
Neil Brown <neilb@cse.unsw.edu.au> Signed-off-by:
Andrew Morton <akpm@osdl.org> Signed-off-by:
Linus Torvalds <torvalds@osdl.org>
-
Neil Brown authored
The only reason we're keeping a pointer to the stateid in the delegation is so we can get at st_vfs_file. So we should just keep a pointer to the struct file instead. Signed-off-by:
-
Neil Brown authored
Just separate part of release_deleg into a separate function. Signed-off-by:
-
Neil Brown authored
The delegation recall callback is setting the REAP_DELEGATION state when it drops the reference count to zero instead of just freeing the thing itself, which is needlessly complicated and bug-prone. It's simpler just to define a nfs4_put_delegation() which works in the usual way and have the delegation recall code do call that itself. Eventually I'll convert all the nfsd4 state reference counts to struct krefs which will be harder to abuse in this way.... Signed-off-by:
-
Neil Brown authored
We weren't taking the reference count in the delegation recall thread until we'd already started the new delegation thread (and possibly returned from the break_lease callback). That's too late. Also document some assumptions. Signed-off-by:
-
Neil Brown authored
The st_vfs_file field *must* be non-NULL as long as the stateid is in use, so there's no point testing for it, unless we want to just BUG(). But since we'd immediately hit a NULL dereference in every case, there's no need even for that. Signed-off-by:
-
Neil Brown authored
Note st_vfs_set is redundant; we can always just check whether st_vfs_file is set. Fix one inconsistency along the way: we were setting st_vfs_file to 0 in one case without fput()'ing st_vfs_file. It doesn't appear there was a need to do either one in that case. Signed-off-by:
-
Neil Brown authored
The laundromat is freeing any delegation it finds in the RECALL_COMPLETE state. But note that RECALL_COMPLETE is the state that the delegation recall callback leaves the state in. We shouldn't actually be giving up on the delegation till either the client has had a chance to call delegreturn, or the lease time has run out. Signed-off-by:
-
Neil Brown authored
There's no reason to have the lockowners hang off the same list on the client struct as the openowners do; you can always get to the lockowners from their original openowners instead. Signed-off-by:
-
Neil Brown authored
The name makes it sounds like the job of this function is to release a single lockowner; the plural seems clearer. Signed-off-by:
-
Neil Brown authored
We don't need dl_recall_cnt any more, we're just using a local variable in nfsd4_cb_recall. Signed-off-by:
-
Neil Brown authored
Miscellaneous cleanup including: remove recursion use a local variable instead of dl_recall_cnt Signed-off-by:
-
Neil Brown authored
Whitespace, etc. Signed-off-by:
-
Neil Brown authored
Use a synchronous rpc for the delegation recall. This is simpler and avoids putting rpciod to sleep for 2 seconds on retries. Signed-off-by:
-
Neil Brown authored
The rpc creds we look up in the callback code need puts. Signed-off-by:
-
Neil Brown authored
The return value of nfsd4_cb_recall isn't really used (and the errors we were returning were incorrect anyway). Signed-off-by:
-
Neil Brown authored
Remove incorrect kfree. Signed-off-by:
-
Neil Brown authored
Pass the callback_ident received in SETCLIENTID to the CB_RECALL rpc. Signed-off-by:
Andy Adamson <andros@citi.umich.edu> Signed-off-by:
-
Neil Brown authored
Fix "find" functions that use return value redundantly. Calculate hashes on demand. Miscellaneous kernel style. Signed-off-by:
-
Neil Brown authored
There's no need to return duplicate information through the return value and an argument. Other minor cleanup. Signed-off-by:
-
Neil Brown authored
If the client was given a delegation, but our callback path to the client has since failed for some reason, then our only chance to inform the client of this is to return the cb_path_down error next time the client attempts to renew its state. Signed-off-by:
-
Neil Brown authored
Don't bother searching for unconfirmed clients when handling RENEW; a client is pretty sick if it's trying to renew state it hasn't even finished acquiring yet. Signed-off-by:
-
Neil Brown authored
Simplify verify_clientid out of existance. Signed-off-by:
-
Neil Brown authored
We repeat the same hash table searches in a bunch of places, and keep making the mistake of assuming the variable iterating over the list will be NULL when the search fails. Some helper functions here simplify things a bit. While we're at it, make move_to_confirmed take just a clp instead of making the caller compute the hash. This means we sometimes have to compute the hash multiple times, but it's only an &, so no big deal. Signed-off-by:
-
Neil Brown authored
Inline nfs4_check_delegmode, replace & by &&, remove incorrect check. (Note that it's fine to read using the stateid for a write delegation.) While we're at it, the status return logic seems like overkill for one simple check. Signed-off-by:
-
Neil Brown authored
We would have oopsed some time ago if either of these parameters were NULL. Signed-off-by:
-
Neil Brown authored
Don't hand out a delegation to a client that already has one. Minor simplification and reformatting. Signed-off-by:
-
Neil Brown authored
Simplify logic in nfs4_open_delegation, fix a small bug on allocation failure. Signed-off-by:
-
Neil Brown authored
The DONT_DELEGATE flag is superfluous. Signed-off-by:
-
Neil Brown authored
Turn off rpc layer timeout replay for the NFSv4 server callback client. Rely on manual replay in nfs4_cb_recall_done instead. Signed-off-by:
-
Neil Brown authored
Only release a struct nfs4_file if there are no associated delegations. Signed-off-by:
-
Neil Brown authored
More minor logic cleanup. Signed-off-by:
-
Neil Brown authored
Replace sequence of if {... goto} 's by if-elseif's, other minor simplification of logic. Signed-off-by: -
Neil Brown authored
Minor trivial cleanup, mostly whitespace. Signed-off-by:
-
Neil Brown authored
Use the struct file * obtained in nfsd4_open for nfsd_read and nfsd_write when available. To do this we add a struct file * argument to nfsd_read and nfsd_write. If a struct file is passed in, nfsd_read and nfsd_write will use it, doing just an access check instead of an open and close. If the new argument is NULL, they will fall back on the old behaviour. Signed-off-by:
-
Neil Brown authored
Allow READ and WRITE during the grace period on OPEN or LOCK state that has been reclaimed, for files for which mandatory locking is not in force. (Reads and writes to files with mandatory locking must be delayed until we're sure all the other clients have had a chance to recover locks.) Signed-off-by:
-
Neil Brown authored
Move special stateid processing to nfs4_preprocess_stateid_op(). Also make stateid processing for setattr the same as that for write. Signed-off-by:
-
Neil Brown authored
Remove unnecessary fields in the nfs4_client_reclaim structure. Initialize reclaim_str_hashtbl_size and increment it inside of nfs4_client_to_reclaim. Modify client_to_reclaim() in preparation for reboot recovery. Signed-off-by:
-
Neil Brown authored
Properly decrement refcount on failure in nfsd4_probe_callback. Signed-off-by:
-
Neil Brown authored
Fix Oops at nfsd shutdown. Reap any open nfs4_stateowners remaining on the close_lru hash list prior to reaping nfs4_clients at shutdown. Signed-off-by:
-
