Switch b_release_1_4_6 to use new libsysio.

diff --git a/build/buildcvs b/build/buildcvs
index 64900cf..dc47930 100644 (file)
--- a/build/buildcvs
+++ b/build/buildcvs
@@ -76,6 +76,12 @@ case "$lustretag" in
         lnettag=b_release_1_4_6
         ;;
     
+    b_release_1_4_6)
+        portalstag=b_release_1_4_6
+        lnettag=b_release_1_4_6
+       libsysiotag=b_release_1_4_6
+        ;;
+
     # starting with 1_4_6, we have a tagged lnet too
     b_release_1_4_[6-9]*)
         portalstag=$lustretag

diff --git a/lustre/liblustre/dir.c b/lustre/liblustre/dir.c
index 5ce8a64..3a59da9 100644 (file)
--- a/lustre/liblustre/dir.c
+++ b/lustre/liblustre/dir.c
@@ -194,8 +194,8 @@ static int filldir(char *buf, int buflen,
         return 0;
 }
 
-ssize_t llu_iop_getdirentries(struct inode *ino, char *buf, size_t nbytes,
-                              _SYSIO_OFF_T *basep)
+ssize_t llu_iop_filldirentries(struct inode *ino, _SYSIO_OFF_T *basep, 
+                              char *buf, size_t nbytes)
 {
         struct llu_inode_info *lli = llu_i2info(ino);
         struct intnl_stat *st = llu_i2stat(ino);

diff --git a/lustre/liblustre/llite_lib.h b/lustre/liblustre/llite_lib.h
index edfe806..fdc9268 100644 (file)
--- a/lustre/liblustre/llite_lib.h
+++ b/lustre/liblustre/llite_lib.h
@@ -231,8 +231,8 @@ int llu_mdc_blocking_ast(struct ldlm_lock *lock,
                          void *data, int flag);
 
 /* dir.c */
-ssize_t llu_iop_getdirentries(struct inode *ino, char *buf, size_t nbytes,
-                              _SYSIO_OFF_T *basep);
+ssize_t llu_iop_filldirentries(struct inode *ino, _SYSIO_OFF_T *basep, 
+                              char *buf, size_t nbytes);
 
 /* ext2 related */
 #define EXT2_NAME_LEN (255)

diff --git a/lustre/liblustre/super.c b/lustre/liblustre/super.c
index b84ff27..17b96de 100644 (file)
--- a/lustre/liblustre/super.c
+++ b/lustre/liblustre/super.c
@@ -1887,7 +1887,7 @@ static struct inode_ops llu_inode_ops = {
         inop_lookup:    llu_iop_lookup,
         inop_getattr:   llu_iop_getattr,
         inop_setattr:   llu_iop_setattr,
-        inop_getdirentries:     llu_iop_getdirentries,
+        inop_filldirentries:     llu_iop_filldirentries,
         inop_mkdir:     llu_iop_mkdir_raw,
         inop_rmdir:     llu_iop_rmdir_raw,
         inop_symlink:   llu_iop_symlink_raw,