From: Fred Isaman <iisaman@netapp.com>
To: linux-nfs@vger.kernel.org
Subject: [PATCH 05/11] wave 2: remove notify_drained
Date: Wed, 15 Dec 2010 11:03:05 -0500 [thread overview]
Message-ID: <1292428991-30788-5-git-send-email-iisaman@netapp.com> (raw)
In-Reply-To: <1292428991-30788-1-git-send-email-iisaman@netapp.com>
Just code it inline.
Signed-off-by: Fred Isaman <iisaman@netapp.com>
---
fs/nfs/callback.h | 5 -----
fs/nfs/pnfs.c | 2 +-
2 files changed, 1 insertions(+), 6 deletions(-)
diff --git a/fs/nfs/callback.h b/fs/nfs/callback.h
index 6691be1..c4d2a07 100644
--- a/fs/nfs/callback.h
+++ b/fs/nfs/callback.h
@@ -168,11 +168,6 @@ extern unsigned nfs4_callback_layoutrecall(
extern void nfs4_check_drain_bc_complete(struct nfs4_session *ses);
-static inline void notify_drained(struct nfs_client *clp, int count)
-{
- atomic_sub(count, &clp->cl_drain_notify);
-}
-
#endif /* CONFIG_NFS_V4_1 */
extern __be32 nfs4_callback_getattr(struct cb_getattrargs *args,
diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c
index df6561a..dadc113 100644
--- a/fs/nfs/pnfs.c
+++ b/fs/nfs/pnfs.c
@@ -287,7 +287,7 @@ static void free_lseg(struct pnfs_layout_segment *lseg)
BUG_ON(atomic_read(&lseg->pls_refcount) != 0);
NFS_SERVER(ino)->pnfs_curr_ld->free_lseg(lseg);
- notify_drained(NFS_SERVER(ino)->nfs_client, count);
+ atomic_sub(count, &NFS_SERVER(ino)->nfs_client->cl_drain_notify);
/* Matched by get_layout_hdr_locked in pnfs_insert_layout */
put_layout_hdr(NFS_I(ino)->layout);
}
--
1.7.2.1
next prev parent reply other threads:[~2010-12-15 16:03 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-15 16:03 [PATCH 01/11] wave 2: restore removed comment in nfs4_evict_inode Fred Isaman
2010-12-15 16:03 ` [PATCH 02/11] wave 2: remove gratuitous changes to nfs4_layoutget_done Fred Isaman
2010-12-15 16:03 ` [PATCH 03/11] wave 2: remove pnfs_ld_layoutret_on_setattr() Fred Isaman
2010-12-15 16:03 ` [PATCH 04/11] wave 2: share code between put_lseg and pnfs_free_lseg_list Fred Isaman
2010-12-15 16:03 ` Fred Isaman [this message]
2010-12-15 16:03 ` [PATCH 06/11] wave 2: rename notify fields Fred Isaman
2010-12-15 16:03 ` [PATCH 07/11] wave 2: remove trigger_flush Fred Isaman
2010-12-15 16:03 ` [PATCH 08/11] wave 2: remove table above should_free_lseg Fred Isaman
2010-12-15 16:03 ` [PATCH 09/11] wave 2: Fix outdated comment above _pnfs_return_layout Fred Isaman
2010-12-15 16:03 ` [PATCH 10/11] wave 2: remove unneeded include from pnfs.h Fred Isaman
2010-12-15 16:03 ` [PATCH 11/11] wave 2: remove unneeded includes from callback_proc.c Fred Isaman
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=1292428991-30788-5-git-send-email-iisaman@netapp.com \
--to=iisaman@netapp.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;
as well as URLs for NNTP newsgroup(s).