On Fri, Apr 18, 2008 at 02:19:18PM -0400, bfields wrote:
> Really it should be now, though there's another week or so when we can
> submit stuff if it's in good shape.
>
> But I'm feeling bad about letting this go recently, so I'll look at the
> last couple issues and do some testing over the next few days...
OK, I changed the return value to -EIO in the case locks weren't
unlocked. (Better suggestions welcomed. I notice lockd actually BUG()s
in a similar situation elsewhere in the code, but that's probably not
right.)
I also simplified the nlm_traverse_files() change so now it's just:
@@ -241,6 +248,8 @@ nlm_traverse_files(void *data, nlm_host_match_fn_t match)
mutex_lock(&nlm_file_mutex);
for (i = 0; i < FILE_NRHASH; i++) {
hlist_for_each_entry_safe(file, pos, next, &nlm_files[i], f_list) {
+ if (is_failover_file && !is_failover_file(data, file))
+ continue;
file->f_count++;
mutex_unlock(&nlm_file_mutex);
Since the "continue" happens before we do anything at all with that
file, I believe this is safe, and avoids the need for the extra
nlm_file_inuse() call.
And I split the patch into two (unlock_ip, unlock_fs) and edited the
commit messages a little.
The only testing I've done was just connecthon tests plus a simple
manual test with unlock_filesystem (acquiring a lock from a client,
echoing path to unlock_filesystem, verifying that it's gone from
/proc/locks).
Revised patches follow....
--b.
-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
NFS maillist - NFS@xxxxxxxxxxxxxxxxxxxxx
https://lists.sourceforge.net/lists/listinfo/nfs
_______________________________________________
Please note that nfs@xxxxxxxxxxxxxxxxxxxxx is being discontinued.
Please subscribe to linux-nfs@xxxxxxxxxxxxxxx instead.
http://vger.kernel.org/vger-lists.html#linux-nfs
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
