Merge of b1_2.

diff --git a/lustre/liblustre/dir.c b/lustre/liblustre/dir.c
index c236d73..cceb1e0 100644 (file)
--- a/lustre/liblustre/dir.c
+++ b/lustre/liblustre/dir.c
@@ -75,7 +75,7 @@ static int llu_dir_do_readpage(struct inode *inode, struct page *page)
         }
 
         rc = ldlm_lock_match(obddev->obd_namespace, LDLM_FL_BLOCK_GRANTED,
-                             &res_id, LDLM_PLAIN, NULL, LCK_PR, &lockh);
+                             &res_id, LDLM_PLAIN, NULL, 0, LCK_PR, &lockh);
         if (!rc) {
                 llu_prepare_mdc_op_data(&data, inode, NULL, NULL, 0, 0);
 

diff --git a/lustre/liblustre/tests/test_common.c b/lustre/liblustre/tests/test_common.c
index a87f0fa..6f6676e 100644 (file)
--- a/lustre/liblustre/tests/test_common.c
+++ b/lustre/liblustre/tests/test_common.c
@@ -181,18 +181,6 @@ int t_open(const char *path)
         return fd;
 }
 
-int t_opendir(const char *path)
-{
-        int fd;
-
-        fd = open(path, O_RDONLY);
-        if (fd < 0) {
-                printf("opendir(%s) error: %s\n", path, strerror(errno));
-                EXIT_RET(fd);
-        }
-        return fd;
-}
-
 void t_close(int fd)
 {
         int rc;

diff --git a/lustre/liblustre/tests/test_common.h b/lustre/liblustre/tests/test_common.h
index c3687b9..9d537cc 100644 (file)
--- a/lustre/liblustre/tests/test_common.h
+++ b/lustre/liblustre/tests/test_common.h
@@ -21,7 +21,6 @@ void t_chmod(const char *path, const char *format, ...);
 void t_rename(const char *oldpath, const char *newpath);
 int t_open_readonly(const char *path);
 int t_open(const char *path);
-int t_opendir(const char *path);
 void t_close(int fd);
 int t_check_stat(const char *name, struct stat *buf);
 int t_check_stat_fail(const char *name);