Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
b=22632 update mptsas driver to PH16-4.18.20.04
[fs/lustre-release.git]
/
lustre
/
obdclass
/
llog_lvfs.c
diff --git
a/lustre/obdclass/llog_lvfs.c
b/lustre/obdclass/llog_lvfs.c
index
1b7117c
..
ddced97
100644
(file)
--- a/
lustre/obdclass/llog_lvfs.c
+++ b/
lustre/obdclass/llog_lvfs.c
@@
-26,7
+26,7
@@
* GPL HEADER END
*/
/*
* GPL HEADER END
*/
/*
- * Copyright
2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright
(c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*/
/*
* Use is subject to license terms.
*/
/*
@@
-608,7
+608,7
@@
static int llog_lvfs_create(struct llog_ctxt *ctxt, struct llog_handle **res,
if (logid != NULL) {
dchild = obd_lvfs_fid2dentry(ctxt->loc_exp, logid->lgl_oid,
if (logid != NULL) {
dchild = obd_lvfs_fid2dentry(ctxt->loc_exp, logid->lgl_oid,
- logid->lgl_ogen, logid->lgl_o
gr
);
+ logid->lgl_ogen, logid->lgl_o
seq
);
if (IS_ERR(dchild)) {
rc = PTR_ERR(dchild);
if (IS_ERR(dchild)) {
rc = PTR_ERR(dchild);
@@
-621,7
+621,7
@@
static int llog_lvfs_create(struct llog_ctxt *ctxt, struct llog_handle **res,
l_dput(dchild);
rc = -ENOENT;
CERROR("nonexistent log file "LPX64":"LPX64": rc %d\n",
l_dput(dchild);
rc = -ENOENT;
CERROR("nonexistent log file "LPX64":"LPX64": rc %d\n",
- logid->lgl_oid, logid->lgl_o
gr
, rc);
+ logid->lgl_oid, logid->lgl_o
seq
, rc);
GOTO(out, rc);
}
GOTO(out, rc);
}
@@
-644,7
+644,7
@@
static int llog_lvfs_create(struct llog_ctxt *ctxt, struct llog_handle **res,
if (IS_ERR(handle->lgh_file))
GOTO(out, rc = PTR_ERR(handle->lgh_file));
if (IS_ERR(handle->lgh_file))
GOTO(out, rc = PTR_ERR(handle->lgh_file));
- handle->lgh_id.lgl_o
gr
= 1;
+ handle->lgh_id.lgl_o
seq
= 1;
handle->lgh_id.lgl_oid =
handle->lgh_file->f_dentry->d_inode->i_ino;
handle->lgh_id.lgl_ogen =
handle->lgh_id.lgl_oid =
handle->lgh_file->f_dentry->d_inode->i_ino;
handle->lgh_id.lgl_ogen =
@@
-654,15
+654,19
@@
static int llog_lvfs_create(struct llog_ctxt *ctxt, struct llog_handle **res,
if (oa == NULL)
GOTO(out, rc = -ENOMEM);
if (oa == NULL)
GOTO(out, rc = -ENOMEM);
- oa->o_
gr = FILTER_GROUP
_LLOG;
+ oa->o_
seq = FID_SEQ
_LLOG;
oa->o_valid = OBD_MD_FLGENER | OBD_MD_FLGROUP;
rc = obd_create(ctxt->loc_exp, oa, NULL, NULL);
if (rc)
GOTO(out, rc);
oa->o_valid = OBD_MD_FLGENER | OBD_MD_FLGROUP;
rc = obd_create(ctxt->loc_exp, oa, NULL, NULL);
if (rc)
GOTO(out, rc);
+ /* FIXME: rationalize the misuse of o_generation in
+ * this API along with mds_obd_{create,destroy}.
+ * Hopefully it is only an internal API issue. */
+#define o_generation o_parent_oid
dchild = obd_lvfs_fid2dentry(ctxt->loc_exp, oa->o_id,
dchild = obd_lvfs_fid2dentry(ctxt->loc_exp, oa->o_id,
- oa->o_generation, oa->o_
gr
);
+ oa->o_generation, oa->o_
seq
);
if (IS_ERR(dchild))
GOTO(out, rc = PTR_ERR(dchild));
if (IS_ERR(dchild))
GOTO(out, rc = PTR_ERR(dchild));
@@
-672,7
+676,7
@@
static int llog_lvfs_create(struct llog_ctxt *ctxt, struct llog_handle **res,
if (IS_ERR(handle->lgh_file))
GOTO(out, rc = PTR_ERR(handle->lgh_file));
if (IS_ERR(handle->lgh_file))
GOTO(out, rc = PTR_ERR(handle->lgh_file));
- handle->lgh_id.lgl_o
gr = oa->o_gr
;
+ handle->lgh_id.lgl_o
seq = oa->o_seq
;
handle->lgh_id.lgl_oid = oa->o_id;
handle->lgh_id.lgl_ogen = oa->o_generation;
}
handle->lgh_id.lgl_oid = oa->o_id;
handle->lgh_id.lgl_ogen = oa->o_generation;
}
@@
-738,8
+742,9
@@
static int llog_lvfs_destroy(struct llog_handle *handle)
RETURN(-ENOMEM);
oa->o_id = handle->lgh_id.lgl_oid;
RETURN(-ENOMEM);
oa->o_id = handle->lgh_id.lgl_oid;
- oa->o_
gr = handle->lgh_id.lgl_ogr
;
+ oa->o_
seq = handle->lgh_id.lgl_oseq
;
oa->o_generation = handle->lgh_id.lgl_ogen;
oa->o_generation = handle->lgh_id.lgl_ogen;
+#undef o_generation
oa->o_valid = OBD_MD_FLID | OBD_MD_FLGROUP | OBD_MD_FLGENER;
rc = llog_lvfs_close(handle);
oa->o_valid = OBD_MD_FLID | OBD_MD_FLGROUP | OBD_MD_FLGENER;
rc = llog_lvfs_close(handle);