mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-02 23:27:06 +00:00
pNFS: Remove redundant pnfs_mark_layout_returned_if_empty()
That's already being taken care of in pnfs_layout_remove_lseg(). Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
This commit is contained in:
parent
d9b61708fe
commit
f71dfe8fc9
4 changed files with 0 additions and 16 deletions
|
@ -252,7 +252,6 @@ static u32 initiate_file_draining(struct nfs_client *clp,
|
||||||
NFS_SERVER(ino)->pnfs_curr_ld->return_range(lo,
|
NFS_SERVER(ino)->pnfs_curr_ld->return_range(lo,
|
||||||
&args->cbl_range);
|
&args->cbl_range);
|
||||||
}
|
}
|
||||||
pnfs_mark_layout_returned_if_empty(lo);
|
|
||||||
unlock:
|
unlock:
|
||||||
spin_unlock(&ino->i_lock);
|
spin_unlock(&ino->i_lock);
|
||||||
pnfs_free_lseg_list(&free_me_list);
|
pnfs_free_lseg_list(&free_me_list);
|
||||||
|
|
|
@ -8128,7 +8128,6 @@ static void nfs4_layoutreturn_release(void *calldata)
|
||||||
spin_lock(&lo->plh_inode->i_lock);
|
spin_lock(&lo->plh_inode->i_lock);
|
||||||
pnfs_mark_matching_lsegs_invalid(lo, &freeme, &lrp->args.range,
|
pnfs_mark_matching_lsegs_invalid(lo, &freeme, &lrp->args.range,
|
||||||
be32_to_cpu(lrp->args.stateid.seqid));
|
be32_to_cpu(lrp->args.stateid.seqid));
|
||||||
pnfs_mark_layout_returned_if_empty(lo);
|
|
||||||
if (lrp->res.lrs_present && pnfs_layout_is_valid(lo))
|
if (lrp->res.lrs_present && pnfs_layout_is_valid(lo))
|
||||||
pnfs_set_layout_stateid(lo, &lrp->res.stateid, true);
|
pnfs_set_layout_stateid(lo, &lrp->res.stateid, true);
|
||||||
pnfs_clear_layoutreturn_waitbit(lo);
|
pnfs_clear_layoutreturn_waitbit(lo);
|
||||||
|
|
|
@ -1159,7 +1159,6 @@ void pnfs_roc_set_barrier(struct inode *ino, u32 barrier)
|
||||||
|
|
||||||
spin_lock(&ino->i_lock);
|
spin_lock(&ino->i_lock);
|
||||||
lo = NFS_I(ino)->layout;
|
lo = NFS_I(ino)->layout;
|
||||||
pnfs_mark_layout_returned_if_empty(lo);
|
|
||||||
if (pnfs_seqid_is_newer(barrier, lo->plh_barrier))
|
if (pnfs_seqid_is_newer(barrier, lo->plh_barrier))
|
||||||
lo->plh_barrier = barrier;
|
lo->plh_barrier = barrier;
|
||||||
spin_unlock(&ino->i_lock);
|
spin_unlock(&ino->i_lock);
|
||||||
|
|
|
@ -552,19 +552,6 @@ pnfs_calc_offset_length(u64 offset, u64 end)
|
||||||
return 1 + end - offset;
|
return 1 + end - offset;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* pnfs_mark_layout_returned_if_empty - marks the layout as returned
|
|
||||||
* @lo: layout header
|
|
||||||
*
|
|
||||||
* Note: Caller must hold inode->i_lock
|
|
||||||
*/
|
|
||||||
static inline void
|
|
||||||
pnfs_mark_layout_returned_if_empty(struct pnfs_layout_hdr *lo)
|
|
||||||
{
|
|
||||||
if (list_empty(&lo->plh_segs))
|
|
||||||
set_bit(NFS_LAYOUT_INVALID_STID, &lo->plh_flags);
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline void
|
static inline void
|
||||||
pnfs_copy_range(struct pnfs_layout_range *dst,
|
pnfs_copy_range(struct pnfs_layout_range *dst,
|
||||||
const struct pnfs_layout_range *src)
|
const struct pnfs_layout_range *src)
|
||||||
|
|
Loading…
Reference in a new issue