|
@@ -251,7 +251,7 @@ EXPORT_SYMBOL_GPL(pnfs_unregister_layoutdriver);
|
|
|
void
|
|
|
pnfs_get_layout_hdr(struct pnfs_layout_hdr *lo)
|
|
|
{
|
|
|
- atomic_inc(&lo->plh_refcount);
|
|
|
+ refcount_inc(&lo->plh_refcount);
|
|
|
}
|
|
|
|
|
|
static struct pnfs_layout_hdr *
|
|
@@ -296,7 +296,7 @@ pnfs_put_layout_hdr(struct pnfs_layout_hdr *lo)
|
|
|
|
|
|
pnfs_layoutreturn_before_put_layout_hdr(lo);
|
|
|
|
|
|
- if (atomic_dec_and_lock(&lo->plh_refcount, &inode->i_lock)) {
|
|
|
+ if (refcount_dec_and_lock(&lo->plh_refcount, &inode->i_lock)) {
|
|
|
if (!list_empty(&lo->plh_segs))
|
|
|
WARN_ONCE(1, "NFS: BUG unfreed layout segments.\n");
|
|
|
pnfs_detach_layout_hdr(lo);
|
|
@@ -395,14 +395,14 @@ pnfs_layout_set_fail_bit(struct pnfs_layout_hdr *lo, int fail_bit)
|
|
|
{
|
|
|
lo->plh_retry_timestamp = jiffies;
|
|
|
if (!test_and_set_bit(fail_bit, &lo->plh_flags))
|
|
|
- atomic_inc(&lo->plh_refcount);
|
|
|
+ refcount_inc(&lo->plh_refcount);
|
|
|
}
|
|
|
|
|
|
static void
|
|
|
pnfs_layout_clear_fail_bit(struct pnfs_layout_hdr *lo, int fail_bit)
|
|
|
{
|
|
|
if (test_and_clear_bit(fail_bit, &lo->plh_flags))
|
|
|
- atomic_dec(&lo->plh_refcount);
|
|
|
+ refcount_dec(&lo->plh_refcount);
|
|
|
}
|
|
|
|
|
|
static void
|
|
@@ -472,7 +472,7 @@ pnfs_layout_remove_lseg(struct pnfs_layout_hdr *lo,
|
|
|
WARN_ON(test_bit(NFS_LSEG_VALID, &lseg->pls_flags));
|
|
|
list_del_init(&lseg->pls_list);
|
|
|
/* Matched by pnfs_get_layout_hdr in pnfs_layout_insert_lseg */
|
|
|
- atomic_dec(&lo->plh_refcount);
|
|
|
+ refcount_dec(&lo->plh_refcount);
|
|
|
if (test_bit(NFS_LSEG_LAYOUTRETURN, &lseg->pls_flags))
|
|
|
return;
|
|
|
if (list_empty(&lo->plh_segs) &&
|
|
@@ -1451,7 +1451,7 @@ alloc_init_layout_hdr(struct inode *ino,
|
|
|
lo = pnfs_alloc_layout_hdr(ino, gfp_flags);
|
|
|
if (!lo)
|
|
|
return NULL;
|
|
|
- atomic_set(&lo->plh_refcount, 1);
|
|
|
+ refcount_set(&lo->plh_refcount, 1);
|
|
|
INIT_LIST_HEAD(&lo->plh_layouts);
|
|
|
INIT_LIST_HEAD(&lo->plh_segs);
|
|
|
INIT_LIST_HEAD(&lo->plh_return_segs);
|