From: Anna Schumaker <Anna.Schumaker@netapp.com>
To: <Trond.Myklebust@primarydata.com>, <linux-nfs@vger.kernel.org>
Cc: <Anna.Schumaker@netapp.com>
Subject: [PATCH 6/9] NFS: Remove nfs4_match_stateid()
Date: Fri, 10 Jul 2015 16:58:14 -0400 [thread overview]
Message-ID: <1436561897-8051-7-git-send-email-Anna.Schumaker@Netapp.com> (raw)
In-Reply-To: <1436561897-8051-1-git-send-email-Anna.Schumaker@Netapp.com>
Let's just call nfs4_stateid_match() directly.
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
---
fs/nfs/nfs4proc.c | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 6f228b5..b911fb0 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -8514,12 +8514,6 @@ static bool nfs41_match_stateid(const nfs4_stateid *s1,
#endif /* CONFIG_NFS_V4_1 */
-static bool nfs4_match_stateid(const nfs4_stateid *s1,
- const nfs4_stateid *s2)
-{
- return nfs4_stateid_match(s1, s2);
-}
-
static const struct nfs4_state_recovery_ops nfs40_reboot_recovery_ops = {
.owner_flag_bit = NFS_OWNER_RECLAIM_REBOOT,
@@ -8594,7 +8588,7 @@ static const struct nfs4_minor_version_ops nfs_v4_0_minor_ops = {
| NFS_CAP_POSIX_LOCK,
.init_client = nfs40_init_client,
.shutdown_client = nfs40_shutdown_client,
- .match_stateid = nfs4_match_stateid,
+ .match_stateid = nfs4_stateid_match,
.find_root_sec = nfs4_find_root_sec,
.free_lock_state = nfs4_release_lockowner,
.alloc_seqid = nfs_alloc_seqid,
--
2.4.5
next prev parent reply other threads:[~2015-07-10 20:59 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-10 20:58 [PATCH 0/9] NFS: Clean up unnecessary functions Anna Schumaker
2015-07-10 20:58 ` [PATCH 1/9] NFS: Remove unused variable "pages_ptr" Anna Schumaker
2015-07-13 6:59 ` Christoph Hellwig
2015-07-10 20:58 ` [PATCH 2/9] NFS: Rename nfs_readdir_free_pagearray() and nfs_readdir_large_page() Anna Schumaker
2015-07-13 6:59 ` Christoph Hellwig
2015-07-10 20:58 ` [PATCH 3/9] SUNRPC: Drop double-underscores from rpc_cmp_addr{4|6}() Anna Schumaker
2015-07-13 7:00 ` Christoph Hellwig
2015-07-10 20:58 ` [PATCH 4/9] NFS: Use RPC functions for matching sockaddrs Anna Schumaker
2015-07-13 7:03 ` Christoph Hellwig
2015-07-13 13:56 ` Anna Schumaker
2015-07-13 14:21 ` Anna Schumaker
2015-07-13 14:32 ` Chuck Lever
2015-07-13 14:49 ` Anna Schumaker
2015-07-10 20:58 ` [PATCH 5/9] NFS: Combine nfs_idmap_{init|quit}() and nfs_idmap_{init|quit}_keyring() Anna Schumaker
2015-07-13 7:03 ` Christoph Hellwig
2015-07-10 20:58 ` Anna Schumaker [this message]
2015-07-13 7:03 ` [PATCH 6/9] NFS: Remove nfs4_match_stateid() Christoph Hellwig
2015-07-10 20:58 ` [PATCH 7/9] NFS: Remove nfs41_server_notify_{target|highest}_slotid_update() Anna Schumaker
2015-07-13 7:04 ` Christoph Hellwig
2015-07-10 20:58 ` [PATCH 8/9] NFS: Rename nfs_commit_unstable_pages() to nfs_write_inode() Anna Schumaker
2015-07-13 7:04 ` Christoph Hellwig
2015-07-10 20:58 ` [PATCH 9/9] NFS: Remove nfs_release() Anna Schumaker
2015-07-13 7:04 ` Christoph Hellwig
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=1436561897-8051-7-git-send-email-Anna.Schumaker@Netapp.com \
--to=anna.schumaker@netapp.com \
--cc=Trond.Myklebust@primarydata.com \
--cc=linux-nfs@vger.kernel.org \
/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