summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrond Myklebust <trond.myklebust@primarydata.com>2015-03-09 15:37:00 -0400
committerTrond Myklebust <trond.myklebust@primarydata.com>2015-03-27 12:32:24 -0400
commitfb1458f4578c8dc78dc124de2a58950a6d4e3492 (patch)
tree3048ad472689aedd7837832558133be425785be7
parent84a80f62f71beac20a426709c04b49f2bd352291 (diff)
downloadlinux-stable-fb1458f4578c8dc78dc124de2a58950a6d4e3492.tar.gz
linux-stable-fb1458f4578c8dc78dc124de2a58950a6d4e3492.tar.bz2
linux-stable-fb1458f4578c8dc78dc124de2a58950a6d4e3492.zip
NFSv4.1: Cleanup - don't opencode nfs4_put_deviceid_node()
There really is no reason to do so. Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
-rw-r--r--fs/nfs/pnfs_dev.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/nfs/pnfs_dev.c b/fs/nfs/pnfs_dev.c
index bf23ac97d57d..7e07f4ba4822 100644
--- a/fs/nfs/pnfs_dev.c
+++ b/fs/nfs/pnfs_dev.c
@@ -238,8 +238,7 @@ nfs4_delete_deviceid(const struct pnfs_layoutdriver_type *ld,
spin_unlock(&nfs4_deviceid_lock);
/* balance the initial ref set in pnfs_insert_deviceid */
- if (atomic_dec_and_test(&d->ref))
- d->ld->free_deviceid_node(d);
+ nfs4_put_deviceid_node(d);
}
EXPORT_SYMBOL_GPL(nfs4_delete_deviceid);
@@ -323,8 +322,7 @@ _deviceid_purge_client(const struct nfs_client *clp, long hash)
while (!hlist_empty(&tmp)) {
d = hlist_entry(tmp.first, struct nfs4_deviceid_node, tmpnode);
hlist_del(&d->tmpnode);
- if (atomic_dec_and_test(&d->ref))
- d->ld->free_deviceid_node(d);
+ nfs4_put_deviceid_node(d);
}
}