FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-02-04 10:09:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

staging: lustre: lu_dirent_calc_size() return type to size_t

Browse Source 
Change the type accordant usage.

Signed-off-by: Dmitry Eremin <dmitry.eremin@intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-5577
Reviewed-on: http://review.whamcloud.com/12383
Reviewed-by: John L. Hammond <john.hammond@intel.com>
Reviewed-by: James Simmons <uja.ornl@gmail.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: James Simmons <jsimmons@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Dmitry Eremin 2016-09-18 16:38:03 -04:00 committed by Greg Kroah-Hartman
parent 6f5083978b
commit 8060c90186
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/staging/lustre/lustre/include/lustre/lustre_idl.h
View File

@ -1013,12 +1013,12 @@ static inline struct lu_dirent *lu_dirent_next(struct lu_dirent *ent)
return next; return next;
} }
static inline int lu_dirent_calc_size(int namelen, __u16 attr) static inline size_t lu_dirent_calc_size(size_t namelen, __u16 attr)
{ {
int size; size_t size;
if (attr & LUDA_TYPE) { if (attr & LUDA_TYPE) {
const unsigned align = sizeof(struct luda_type) - 1; const size_t align = sizeof(struct luda_type) - 1;
size = (sizeof(struct lu_dirent) + namelen + align) & ~align; size = (sizeof(struct lu_dirent) + namelen + align) & ~align;
size += sizeof(struct luda_type); size += sizeof(struct luda_type);
@ -1029,15 +1029,6 @@ static inline int lu_dirent_calc_size(int namelen, __u16 attr)
return (size + 7) & ~7; return (size + 7) & ~7;
} }
static inline int lu_dirent_size(const struct lu_dirent *ent)
{
if (le16_to_cpu(ent->lde_reclen) == 0) {
return lu_dirent_calc_size(le16_to_cpu(ent->lde_namelen),
le32_to_cpu(ent->lde_attrs));
}
return le16_to_cpu(ent->lde_reclen);
}
#define MDS_DIR_END_OFF 0xfffffffffffffffeULL #define MDS_DIR_END_OFF 0xfffffffffffffffeULL
/** /**