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
LU-6698 kernel: kernel update RHEL 6.6 [2.6.32-504.23.4.el6]
[fs/lustre-release.git]
/
lustre
/
fld
/
lproc_fld.c
diff --git
a/lustre/fld/lproc_fld.c
b/lustre/fld/lproc_fld.c
index
b4e45fd
..
b231c16
100644
(file)
--- a/
lustre/fld/lproc_fld.c
+++ b/
lustre/fld/lproc_fld.c
@@
-51,7
+51,7
@@
#include <lustre_fid.h>
#include "fld_internal.h"
#include <lustre_fid.h>
#include "fld_internal.h"
-#ifdef
LPROC
FS
+#ifdef
CONFIG_PROC_
FS
static int
fld_proc_targets_seq_show(struct seq_file *m, void *unused)
{
static int
fld_proc_targets_seq_show(struct seq_file *m, void *unused)
{
@@
-136,7
+136,7
@@
LPROC_SEQ_FOPS_RO(fld_proc_targets);
LPROC_SEQ_FOPS(fld_proc_hash);
LPROC_SEQ_FOPS_WO_TYPE(fld, cache_flush);
LPROC_SEQ_FOPS(fld_proc_hash);
LPROC_SEQ_FOPS_WO_TYPE(fld, cache_flush);
-struct lprocfs_
seq_
vars fld_client_proc_list[] = {
+struct lprocfs_vars fld_client_proc_list[] = {
{ .name = "targets",
.fops = &fld_proc_targets_fops },
{ .name = "hash",
{ .name = "targets",
.fops = &fld_proc_targets_fops },
{ .name = "hash",
@@
-279,7
+279,10
@@
static int fldb_seq_open(struct inode *inode, struct file *file)
int env_init = 0;
int rc;
int env_init = 0;
int rc;
- LPROCFS_ENTRY_CHECK(PDE(inode));
+ rc = LPROCFS_ENTRY_CHECK(inode);
+ if (rc < 0)
+ return rc;
+
rc = seq_open(file, &fldb_sops);
if (rc)
GOTO(out, rc);
rc = seq_open(file, &fldb_sops);
if (rc)
GOTO(out, rc);
@@
-301,7
+304,7
@@
static int fldb_seq_open(struct inode *inode, struct file *file)
env_init = 1;
iops = &obj->do_index_ops->dio_it;
env_init = 1;
iops = &obj->do_index_ops->dio_it;
- param->fsp_it = iops->init(¶m->fsp_env, obj, 0
, NULL
);
+ param->fsp_it = iops->init(¶m->fsp_env, obj, 0);
if (IS_ERR(param->fsp_it))
GOTO(out, rc = PTR_ERR(param->fsp_it));
if (IS_ERR(param->fsp_it))
GOTO(out, rc = PTR_ERR(param->fsp_it));
@@
-356,10
+359,10
@@
const struct file_operations fld_proc_seq_fops = {
.release = fldb_seq_release,
};
.release = fldb_seq_release,
};
-struct lprocfs_
seq_
vars fld_server_proc_list[] = {
+struct lprocfs_vars fld_server_proc_list[] = {
{ NULL }
};
# endif /* HAVE_SERVER_SUPPORT */
{ NULL }
};
# endif /* HAVE_SERVER_SUPPORT */
-#endif /*
LPROC
FS */
+#endif /*
CONFIG_PROC_
FS */