diff options
Diffstat (limited to 'fs/nfs/flexfilelayout/flexfilelayout.c')
-rw-r--r-- | fs/nfs/flexfilelayout/flexfilelayout.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/nfs/flexfilelayout/flexfilelayout.c b/fs/nfs/flexfilelayout/flexfilelayout.c index ff55a0a1b2e8..c75ad982bcfc 100644 --- a/fs/nfs/flexfilelayout/flexfilelayout.c +++ b/fs/nfs/flexfilelayout/flexfilelayout.c | |||
@@ -1726,10 +1726,10 @@ ff_layout_read_pagelist(struct nfs_pgio_header *hdr) | |||
1726 | vers = nfs4_ff_layout_ds_version(lseg, idx); | 1726 | vers = nfs4_ff_layout_ds_version(lseg, idx); |
1727 | 1727 | ||
1728 | dprintk("%s USE DS: %s cl_count %d vers %d\n", __func__, | 1728 | dprintk("%s USE DS: %s cl_count %d vers %d\n", __func__, |
1729 | ds->ds_remotestr, atomic_read(&ds->ds_clp->cl_count), vers); | 1729 | ds->ds_remotestr, refcount_read(&ds->ds_clp->cl_count), vers); |
1730 | 1730 | ||
1731 | hdr->pgio_done_cb = ff_layout_read_done_cb; | 1731 | hdr->pgio_done_cb = ff_layout_read_done_cb; |
1732 | atomic_inc(&ds->ds_clp->cl_count); | 1732 | refcount_inc(&ds->ds_clp->cl_count); |
1733 | hdr->ds_clp = ds->ds_clp; | 1733 | hdr->ds_clp = ds->ds_clp; |
1734 | fh = nfs4_ff_layout_select_ds_fh(lseg, idx); | 1734 | fh = nfs4_ff_layout_select_ds_fh(lseg, idx); |
1735 | if (fh) | 1735 | if (fh) |
@@ -1785,11 +1785,11 @@ ff_layout_write_pagelist(struct nfs_pgio_header *hdr, int sync) | |||
1785 | 1785 | ||
1786 | dprintk("%s ino %lu sync %d req %zu@%llu DS: %s cl_count %d vers %d\n", | 1786 | dprintk("%s ino %lu sync %d req %zu@%llu DS: %s cl_count %d vers %d\n", |
1787 | __func__, hdr->inode->i_ino, sync, (size_t) hdr->args.count, | 1787 | __func__, hdr->inode->i_ino, sync, (size_t) hdr->args.count, |
1788 | offset, ds->ds_remotestr, atomic_read(&ds->ds_clp->cl_count), | 1788 | offset, ds->ds_remotestr, refcount_read(&ds->ds_clp->cl_count), |
1789 | vers); | 1789 | vers); |
1790 | 1790 | ||
1791 | hdr->pgio_done_cb = ff_layout_write_done_cb; | 1791 | hdr->pgio_done_cb = ff_layout_write_done_cb; |
1792 | atomic_inc(&ds->ds_clp->cl_count); | 1792 | refcount_inc(&ds->ds_clp->cl_count); |
1793 | hdr->ds_clp = ds->ds_clp; | 1793 | hdr->ds_clp = ds->ds_clp; |
1794 | hdr->ds_commit_idx = idx; | 1794 | hdr->ds_commit_idx = idx; |
1795 | fh = nfs4_ff_layout_select_ds_fh(lseg, idx); | 1795 | fh = nfs4_ff_layout_select_ds_fh(lseg, idx); |
@@ -1863,11 +1863,11 @@ static int ff_layout_initiate_commit(struct nfs_commit_data *data, int how) | |||
1863 | vers = nfs4_ff_layout_ds_version(lseg, idx); | 1863 | vers = nfs4_ff_layout_ds_version(lseg, idx); |
1864 | 1864 | ||
1865 | dprintk("%s ino %lu, how %d cl_count %d vers %d\n", __func__, | 1865 | dprintk("%s ino %lu, how %d cl_count %d vers %d\n", __func__, |
1866 | data->inode->i_ino, how, atomic_read(&ds->ds_clp->cl_count), | 1866 | data->inode->i_ino, how, refcount_read(&ds->ds_clp->cl_count), |
1867 | vers); | 1867 | vers); |
1868 | data->commit_done_cb = ff_layout_commit_done_cb; | 1868 | data->commit_done_cb = ff_layout_commit_done_cb; |
1869 | data->cred = ds_cred; | 1869 | data->cred = ds_cred; |
1870 | atomic_inc(&ds->ds_clp->cl_count); | 1870 | refcount_inc(&ds->ds_clp->cl_count); |
1871 | data->ds_clp = ds->ds_clp; | 1871 | data->ds_clp = ds->ds_clp; |
1872 | fh = select_ds_fh_from_commit(lseg, data->ds_commit_index); | 1872 | fh = select_ds_fh_from_commit(lseg, data->ds_commit_index); |
1873 | if (fh) | 1873 | if (fh) |