unimore/kernel-hacking-2024-linux-steffo
unimore/kernel-hacking-2024-linux-steffo
1
Fork 0
Code Pull requests 5 Wiki Activity

NFSv4.1: layout segment comparison helpers should take 'const' parameters

Browse source 
Also strip off the unnecessary 'inline' declarations.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
Trond Myklebust 2013-06-03 11:24:36 -04:00
parent c8d74d9b68
commit 3cb2df17ae
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
fs/nfs/pnfs.c
View file

@ -360,7 +360,7 @@ pnfs_put_lseg(struct pnfs_layout_segment *lseg)
} }
EXPORT_SYMBOL_GPL(pnfs_put_lseg); EXPORT_SYMBOL_GPL(pnfs_put_lseg);
static inline u64 static u64
end_offset(u64 start, u64 len) end_offset(u64 start, u64 len)
{ {
u64 end; u64 end;
@ -376,9 +376,9 @@ end_offset(u64 start, u64 len)
* start2 end2 * start2 end2
* [----------------) * [----------------)
*/ */
static inline int static bool
lo_seg_contained(struct pnfs_layout_range *l1, lo_seg_contained(const struct pnfs_layout_range *l1,
struct pnfs_layout_range *l2) const struct pnfs_layout_range *l2)
{ {
u64 start1 = l1->offset; u64 start1 = l1->offset;
u64 end1 = end_offset(start1, l1->length); u64 end1 = end_offset(start1, l1->length);
@ -395,9 +395,9 @@ lo_seg_contained(struct pnfs_layout_range *l1,
* start2 end2 * start2 end2
* [----------------) * [----------------)
*/ */
static inline int static bool
lo_seg_intersecting(struct pnfs_layout_range *l1, lo_seg_intersecting(const struct pnfs_layout_range *l1,
struct pnfs_layout_range *l2) const struct pnfs_layout_range *l2)
{ {
u64 start1 = l1->offset; u64 start1 = l1->offset;
u64 end1 = end_offset(start1, l1->length); u64 end1 = end_offset(start1, l1->length);
@ -409,8 +409,8 @@ lo_seg_intersecting(struct pnfs_layout_range *l1,
} }
static bool static bool
should_free_lseg(struct pnfs_layout_range *lseg_range, should_free_lseg(const struct pnfs_layout_range *lseg_range,
struct pnfs_layout_range *recall_range) const struct pnfs_layout_range *recall_range)
{ {
return (recall_range->iomode == IOMODE_ANY || return (recall_range->iomode == IOMODE_ANY ||
lseg_range->iomode == recall_range->iomode) && lseg_range->iomode == recall_range->iomode) &&
@ -986,8 +986,8 @@ bool pnfs_roc_drain(struct inode *ino, u32 *barrier, struct rpc_task *task)
* are seen first. * are seen first.
*/ */
static s64 static s64
cmp_layout(struct pnfs_layout_range *l1, cmp_layout(const struct pnfs_layout_range *l1,
struct pnfs_layout_range *l2) const struct pnfs_layout_range *l2)
{ {
s64 d; s64 d;
@ -1093,9 +1093,9 @@ pnfs_find_alloc_layout(struct inode *ino,
* READ READ true * READ READ true
* READ RW true * READ RW true
*/ */
static int static bool
is_matching_lseg(struct pnfs_layout_range *ls_range, is_matching_lseg(const struct pnfs_layout_range *ls_range,
struct pnfs_layout_range *range) const struct pnfs_layout_range *range)
{ {
struct pnfs_layout_range range1; struct pnfs_layout_range range1;