[05/11] wave 2: remove notify_drained

Commit Message

Fred Isaman Dec. 15, 2010, 4:03 p.m. UTC

None

Patch

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);
 }