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=13080
[fs/lustre-release.git]
/
lustre
/
ptlrpc
/
llog_server.c
diff --git
a/lustre/ptlrpc/llog_server.c
b/lustre/ptlrpc/llog_server.c
index
d4bd482
..
b06c2f6
100644
(file)
--- a/
lustre/ptlrpc/llog_server.c
+++ b/
lustre/ptlrpc/llog_server.c
@@
-223,7
+223,7
@@
int llog_origin_handle_next_block(struct ptlrpc_request *req)
ptr = lustre_msg_buf(req->rq_repmsg, REPLY_REC_OFF, sizeof (body));
memcpy(ptr, body, sizeof(*body));
ptr = lustre_msg_buf(req->rq_repmsg, REPLY_REC_OFF, sizeof (body));
memcpy(ptr, body, sizeof(*body));
- ptr = lustre_msg_buf(req->rq_repmsg, REPLY_REC_OFF
+
1, LLOG_CHUNK_SIZE);
+ ptr = lustre_msg_buf(req->rq_repmsg, REPLY_REC_OFF
+
1, LLOG_CHUNK_SIZE);
memcpy(ptr, buf, LLOG_CHUNK_SIZE);
out_close:
memcpy(ptr, buf, LLOG_CHUNK_SIZE);
out_close:
@@
-480,7
+480,7
@@
static int llog_catinfo_config(struct obd_device *obd, char *buf, int buf_len,
l = snprintf(out, remains, "[Log Name]: %s\nLog Size: %llu\n"
"Last Index: %d\nUncanceled Records: %d\n\n",
name[i],
l = snprintf(out, remains, "[Log Name]: %s\nLog Size: %llu\n"
"Last Index: %d\nUncanceled Records: %d\n\n",
name[i],
-
handle->lgh_file->f_dentry->d_inode->i_size
,
+
i_size_read(handle->lgh_file->f_dentry->d_inode)
,
handle->lgh_last_idx, uncanceled);
out += l;
remains -= l;
handle->lgh_last_idx, uncanceled);
out += l;
remains -= l;
@@
-541,7
+541,7
@@
static int llog_catinfo_cb(struct llog_handle *cat,
"\tLog Size: %llu\n\tLast Index: %d\n"
"\tUncanceled Records: %d\n",
logid->lgl_oid, logid->lgl_ogr, logid->lgl_ogen,
"\tLog Size: %llu\n\tLast Index: %d\n"
"\tUncanceled Records: %d\n",
logid->lgl_oid, logid->lgl_ogr, logid->lgl_ogen,
-
handle->lgh_file->f_dentry->d_inode->i_size
,
+
i_size_read(handle->lgh_file->f_dentry->d_inode)
,
handle->lgh_last_idx, count);
out += l;
remains -= l;
handle->lgh_last_idx, count);
out += l;
remains -= l;