From: bjschuma@netapp.com
To: Trond.Myklebust@netapp.com
Cc: linux-nfs@vger.kernel.org, steved@redhat.com,
Bryan Schumaker <bjschuma@netapp.com>
Subject: [PATCH v5 6/9] NFS: Remove unused function nfs_lookup_with_sec()
Date: Fri, 27 Apr 2012 13:27:43 -0400 [thread overview]
Message-ID: <1335547666-28315-7-git-send-email-bjschuma@netapp.com> (raw)
In-Reply-To: <1335547666-28315-1-git-send-email-bjschuma@netapp.com>
From: Bryan Schumaker <bjschuma@netapp.com>
This fixes a compiler warning.
---
fs/nfs/namespace.c | 62 ----------------------------------------------------
1 file changed, 62 deletions(-)
diff --git a/fs/nfs/namespace.c b/fs/nfs/namespace.c
index 78dde30..d51868e 100644
--- a/fs/nfs/namespace.c
+++ b/fs/nfs/namespace.c
@@ -148,59 +148,6 @@ rpc_authflavor_t nfs_find_best_sec(struct nfs4_secinfo_flavors *flavors)
return pseudoflavor;
}
-static int nfs_negotiate_security(const struct dentry *parent,
- const struct dentry *dentry,
- rpc_authflavor_t *flavor)
-{
- struct page *page;
- struct nfs4_secinfo_flavors *flavors;
- int (*secinfo)(struct inode *, const struct qstr *, struct nfs4_secinfo_flavors *);
- int ret = -EPERM;
-
- secinfo = NFS_PROTO(parent->d_inode)->secinfo;
- if (secinfo != NULL) {
- page = alloc_page(GFP_KERNEL);
- if (!page) {
- ret = -ENOMEM;
- goto out;
- }
- flavors = page_address(page);
- ret = secinfo(parent->d_inode, &dentry->d_name, flavors);
- *flavor = nfs_find_best_sec(flavors);
- put_page(page);
- }
-
-out:
- return ret;
-}
-
-static int nfs_lookup_with_sec(struct nfs_server *server, struct dentry *parent,
- struct dentry *dentry, struct path *path,
- struct nfs_fh *fh, struct nfs_fattr *fattr,
- rpc_authflavor_t *flavor)
-{
- struct rpc_clnt *clone;
- struct rpc_auth *auth;
- int err;
-
- err = nfs_negotiate_security(parent, path->dentry, flavor);
- if (err < 0)
- goto out;
- clone = rpc_clone_client(server->client);
- auth = rpcauth_create(*flavor, clone);
- if (!auth) {
- err = -EIO;
- goto out_shutdown;
- }
- err = server->nfs_client->rpc_ops->lookup(clone, parent->d_inode,
- &path->dentry->d_name,
- fh, fattr);
-out_shutdown:
- rpc_shutdown_client(clone);
-out:
- return err;
-}
-
static struct rpc_clnt *nfs_lookup_mountpoint(struct inode *dir,
struct qstr *name,
struct nfs_fh *fh,
@@ -217,15 +164,6 @@ static struct rpc_clnt *nfs_lookup_mountpoint(struct inode *dir,
return rpc_clone_client(NFS_SERVER(dir)->client);
}
#else /* CONFIG_NFS_V4 */
-static inline int nfs_lookup_with_sec(struct nfs_server *server,
- struct dentry *parent, struct dentry *dentry,
- struct path *path, struct nfs_fh *fh,
- struct nfs_fattr *fattr,
- rpc_authflavor_t *flavor)
-{
- return -EPERM;
-}
-
static inline struct rpc_clnt *nfs_lookup_mountpoint(struct inode *dir,
struct qstr *name,
struct nfs_fh *fh,
--
1.7.10
next prev parent reply other threads:[~2012-04-27 17:28 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-27 17:27 [PATCH v5 0/9] Fix SECINFO procedure bjschuma
2012-04-27 17:27 ` [PATCH v5 1/9] NFS: Fix SECINFO_NO_NAME bjschuma
2012-04-27 17:27 ` [PATCH v5 2/9] NFS: Handle exceptions coming out of nfs4_proc_fs_locations() bjschuma
2012-04-27 17:27 ` [PATCH v5 3/9] NFS: Do secinfo as part of lookup bjschuma
2012-04-27 17:27 ` [PATCH v5 4/9] NFS: Fix following referral mount points with different security bjschuma
2012-04-27 17:27 ` [PATCH v5 5/9] NFS: Honor the authflavor set in the clone mount data bjschuma
2012-04-27 17:27 ` bjschuma [this message]
2012-04-27 17:27 ` [PATCH v5 7/9] NFS: Remove secinfo knowledge out of the generic client bjschuma
2012-04-27 17:27 ` [PATCH v5 8/9] NFS: Create a submount rpc_op bjschuma
2012-04-27 17:27 ` [PATCH v5 9/9] NFS: Remove extra rpc_clnt argument to proc_lookup bjschuma
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1335547666-28315-7-git-send-email-bjschuma@netapp.com \
--to=bjschuma@netapp.com \
--cc=Trond.Myklebust@netapp.com \
--cc=linux-nfs@vger.kernel.org \
--cc=steved@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox