diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-10 13:26:49 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-10 13:26:49 -0400 |
commit | 51de01700707167209f92a269ddf85433d29fcb3 (patch) | |
tree | 782e91db310e51c63bba76b477deec752e400566 | |
parent | f94eeb423bd6061fe68c490dcb11c74e5267f6a2 (diff) | |
parent | eb04e0ac198cec3bab407ad220438dfa65c19c67 (diff) |
Merge tag 'nfs-for-3.9-5' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
Pull another nfs fixlet from Trond Myklebust:
"I suddenly noticed that a one-line issue that I _thought_ I had fixed
with the nfs41_walk_client_list patch was apparently still there in
the pull request I sent earlier today. I'm very sorry for not
catching that in time.
- Fix a brain fart in nfs41_walk_client_list"
* tag 'nfs-for-3.9-5' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
NFSv4: Doh! Typo in the fix to nfs41_walk_client_list
-rw-r--r-- | fs/nfs/nfs4client.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/nfs/nfs4client.c b/fs/nfs/nfs4client.c index c7b346f8cc44..66b6664dcd4c 100644 --- a/fs/nfs/nfs4client.c +++ b/fs/nfs/nfs4client.c | |||
@@ -482,6 +482,7 @@ int nfs41_walk_client_list(struct nfs_client *new, | |||
482 | 482 | ||
483 | atomic_inc(&pos->cl_count); | 483 | atomic_inc(&pos->cl_count); |
484 | *result = pos; | 484 | *result = pos; |
485 | status = 0; | ||
485 | dprintk("NFS: <-- %s using nfs_client = %p ({%d})\n", | 486 | dprintk("NFS: <-- %s using nfs_client = %p ({%d})\n", |
486 | __func__, pos, atomic_read(&pos->cl_count)); | 487 | __func__, pos, atomic_read(&pos->cl_count)); |
487 | break; | 488 | break; |