[PATCH 064/124] staging: lustre: lu_dirent_calc_size() return type to size_t

[James Simmons]

From: Dmitry Eremin 

Change the type accordant usage.

Signed-off-by: Dmitry Eremin 
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-5577
Reviewed-on: http://review.whamcloud.com/12383
Reviewed-by: John L. Hammond 
Reviewed-by: James Simmons 
Reviewed-by: Oleg Drokin 
Signed-off-by: James Simmons 
---
 .../lustre/lustre/include/lustre/lustre_idl.h  |   15 +++
 1 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/drivers/staging/lustre/lustre/include/lustre/lustre_idl.h 
b/drivers/staging/lustre/lustre/include/lustre/lustre_idl.h
index a0ca571..445b813 100644
--- a/drivers/staging/lustre/lustre/include/lustre/lustre_idl.h
+++ b/drivers/staging/lustre/lustre/include/lustre/lustre_idl.h
@@ -1013,12 +1013,12 @@ static inline struct lu_dirent *lu_dirent_next(struct 
lu_dirent *ent)
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) {
-   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 luda_type);
@@ -1029,15 +1029,6 @@ static inline int lu_dirent_calc_size(int namelen, __u16 
attr)
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 0xfffeULL
 
 /**
-- 
1.7.1

[PATCH 064/124] staging: lustre: lu_dirent_calc_size() return type to size_t

[James Simmons]

From: Dmitry Eremin 

Change the type accordant usage.

Signed-off-by: Dmitry Eremin 
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-5577
Reviewed-on: http://review.whamcloud.com/12383
Reviewed-by: John L. Hammond 
Reviewed-by: James Simmons 
Reviewed-by: Oleg Drokin 
Signed-off-by: James Simmons 
---
 .../lustre/lustre/include/lustre/lustre_idl.h  |   15 +++
 1 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/drivers/staging/lustre/lustre/include/lustre/lustre_idl.h 
b/drivers/staging/lustre/lustre/include/lustre/lustre_idl.h
index a0ca571..445b813 100644
--- a/drivers/staging/lustre/lustre/include/lustre/lustre_idl.h
+++ b/drivers/staging/lustre/lustre/include/lustre/lustre_idl.h
@@ -1013,12 +1013,12 @@ static inline struct lu_dirent *lu_dirent_next(struct 
lu_dirent *ent)
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) {
-   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 luda_type);
@@ -1029,15 +1029,6 @@ static inline int lu_dirent_calc_size(int namelen, __u16 
attr)
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 0xfffeULL
 
 /**
-- 
1.7.1