---

yaml --- r: 294429 b: refs/heads/master c: babea47 h: refs/heads/master i: 294427: d960e4d v: v3
git-mirror · Feb 1, 2012 · bd76cca · bd76cca
1 parent 488d446
commit bd76cca
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 29 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 246590f56c9f281d60b7dd7efa0818307e65600d
+refs/heads/master: babea479b75a9ea3d84ace6d880513e18397a8bb
diff --git a/trunk/fs/nfs/client.c b/trunk/fs/nfs/client.c
@@ -1196,33 +1196,6 @@ struct nfs_server *nfs_create_server(const struct nfs_parsed_mount_data *data,
 }
 
 #ifdef CONFIG_NFS_V4
-/*
- * NFSv4.0 callback thread helper
- *
- * Find a client by IP address, protocol version, and minorversion
- *
- * Called from the pg_authenticate method. The callback identifier
- * is not used as it has not been decoded.
- *
- * Returns NULL if no such client
- */
-struct nfs_client *
-nfs4_find_client_no_ident(const struct sockaddr *addr)
-{
-	struct nfs_client *clp;
-
-	spin_lock(&nfs_client_lock);
-	list_for_each_entry(clp, &nfs_client_list, cl_share_link) {
-		if (nfs4_cb_match_client(addr, clp, 0) == false)
-			continue;
-		atomic_inc(&clp->cl_count);
-		spin_unlock(&nfs_client_lock);
-		return clp;
-	}
-	spin_unlock(&nfs_client_lock);
-	return NULL;
-}
-
 /*
  * NFSv4.0 callback thread helper
  *

diff --git a/trunk/fs/nfs/internal.h b/trunk/fs/nfs/internal.h
@@ -149,7 +149,6 @@ extern struct rpc_program nfs_program;
 
 extern void nfs_cleanup_cb_ident_idr(void);
 extern void nfs_put_client(struct nfs_client *);
-extern struct nfs_client *nfs4_find_client_no_ident(const struct sockaddr *);
 extern struct nfs_client *nfs4_find_client_ident(int);
 extern struct nfs_client *
 nfs4_find_client_sessionid(const struct sockaddr *, struct nfs4_sessionid *);