- removed not needed error message

[fs/lustre-release.git] / lustre / lvfs / llog_lvfs.c

diff --git a/lustre/lvfs/llog_lvfs.c b/lustre/lvfs/llog_lvfs.c
index 1b533f4..2ce4c3b 100644 (file)
--- a/lustre/lvfs/llog_lvfs.c
+++ b/lustre/lvfs/llog_lvfs.c
@@ -391,8 +391,10 @@ static int llog_lvfs_next_block(struct llog_handle *loghandle, int *curr_idx,
                                loghandle->lgh_id.lgl_ogen, *curr_offset);
                         RETURN(-EINVAL);
                 }
-                if (le32_to_cpu(tail->lrt_index) < next_idx)
+                if (le32_to_cpu(tail->lrt_index) < next_idx) {
+                        memset(buf, 0, len);
                         continue;
+                }
 
                 /* sanity check that the start of the new buffer is no farther
                  * than the record that we wanted.  This shouldn't happen. */
@@ -418,7 +420,7 @@ static int llog_lvfs_prev_block(struct llog_handle *loghandle,
         if (len == 0 || len & (LLOG_CHUNK_SIZE - 1))
                 RETURN(-EINVAL);
 
-        CDEBUG(D_OTHER, "looking for log index %u n", prev_idx);
+        CDEBUG(D_OTHER, "looking for log index %u \n", prev_idx);
 
         curr_offset = LLOG_CHUNK_SIZE;
         llog_skip_over(&curr_offset, 0, prev_idx);
@@ -671,7 +673,7 @@ llog_object_create_generic(struct llog_ctxt *ctxt, struct llog_logid *lgh_id)
                         oa->o_generation = lgh_id->lgl_ogen;
                         oa->o_gr = lgh_id->lgl_ogr;
                         oa->o_valid = OBD_MD_FLGENER | OBD_MD_FLGROUP;
-                        rc = obd_create(ctxt->loc_exp, oa, NULL, NULL);
+                        rc = obd_create(ctxt->loc_exp, oa, NULL, 0, NULL, NULL);
                         if (rc) {
                                 CDEBUG(D_INODE, "err during create: %d\n", rc);
                                 GOTO(out_free_oa, rc);
@@ -706,7 +708,7 @@ llog_object_create_generic(struct llog_ctxt *ctxt, struct llog_logid *lgh_id)
 
                 oa->o_gr = FILTER_GROUP_LLOG;
                 oa->o_valid = OBD_MD_FLGENER | OBD_MD_FLGROUP;
-                rc = obd_create(ctxt->loc_exp, oa, NULL, NULL);
+                rc = obd_create(ctxt->loc_exp, oa, NULL, 0, NULL, NULL);
                 if (rc)
                         GOTO(out_free_oa, rc);
 
@@ -887,7 +889,7 @@ static int llog_lvfs_destroy(struct llog_handle *loghandle)
         fdentry = loghandle->lgh_file->f_dentry;
         parent_inode = fdentry->d_parent->d_inode;
         
-        if (!strcmp(fdentry->d_parent->d_name.name, "LOGS")) {
+        if (!strcmp((char *)fdentry->d_parent->d_name.name, "LOGS")) {
                 LASSERT(parent_inode == ctxt->loc_logs_dir->d_inode);
                 
                 id_len = ll_id2str(id_name, fdentry->d_inode->i_ino,
@@ -915,7 +917,7 @@ static int llog_lvfs_destroy(struct llog_handle *loghandle)
                         down(&ctxt->loc_objects_dir->d_inode->i_sem);
                         fdentry = lookup_one_len(id_name, ctxt->loc_objects_dir,
                                                  id_len);
-                        if (fdentry == NULL || fdentry->d_inode == NULL) {
+                        if (IS_ERR(fdentry) || fdentry->d_inode == NULL) {
                                 CERROR("destroy non_existent object %s\n", 
                                        id_name);
                                 GOTO(out_err, rc = IS_ERR(fdentry) ?
@@ -933,7 +935,7 @@ out_err:
                 GOTO(out, rc);
         }
         if (ctxt->loc_alone) {
-                if (!strcmp(fdentry->d_parent->d_name.name, "OBJECTS")) {
+                if (!strcmp((char *)fdentry->d_parent->d_name.name, "OBJECTS")) {
                         LASSERT(parent_inode == ctxt->loc_objects_dir->d_inode);
                         
                         dget(fdentry);