Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f267cdb4 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

staging: lustre: use CONFIG_PROC_FS 



Don't rely on a "custom" LPROCFS define, it's not needed, just check for
the real thing.  This will let us delete a whole .h file that is not
being used for anything other than one #define.

Cc: Andreas Dilger <andreas.dilger@intel.com>
Cc: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 06bf61b2

drivers/staging/lustre/lustre/fid/fid_internal.h

+2 −2
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ 
int seq_client_alloc_super(struct lu_client_seq *seq,

			   const struct lu_env *env);



# ifdef LPROCFS

#if defined (CONFIG_PROC_FS)

extern struct lprocfs_vars seq_client_proc_list[];

#endif

drivers/staging/lustre/lustre/fid/fid_request.c

+4 −4
Original line number Diff line number Diff line
@@ -400,18 +400,18 @@ EXPORT_SYMBOL(seq_client_flush); 


static void seq_client_proc_fini(struct lu_client_seq *seq)

{

#ifdef LPROCFS

#if defined (CONFIG_PROC_FS)

	if (seq->lcs_proc_dir) {

		if (!IS_ERR(seq->lcs_proc_dir))

			lprocfs_remove(&seq->lcs_proc_dir);

		seq->lcs_proc_dir = NULL;

	}

#endif /* LPROCFS */

#endif /* CONFIG_PROC_FS */

}



static int seq_client_proc_init(struct lu_client_seq *seq)

{

#ifdef LPROCFS

#if defined (CONFIG_PROC_FS)

	int rc;



	seq->lcs_proc_dir = lprocfs_register(seq->lcs_name,
@@ -439,7 +439,7 @@ static int seq_client_proc_init(struct lu_client_seq *seq) 
	seq_client_proc_fini(seq);

	return rc;



#else /* LPROCFS */

#else /* CONFIG_PROC_FS */

	return 0;

#endif

}

drivers/staging/lustre/lustre/fld/fld_internal.h

+1 −1
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ extern struct lu_fld_hash fld_hash[]; 
int fld_client_rpc(struct obd_export *exp,

		   struct lu_seq_range *range, __u32 fld_op);



#ifdef LPROCFS

#if defined (CONFIG_PROC_FS)

extern struct lprocfs_vars fld_client_proc_list[];

#endif

drivers/staging/lustre/lustre/fld/fld_request.c

+1 −1
Original line number Diff line number Diff line
@@ -273,7 +273,7 @@ EXPORT_SYMBOL(fld_client_del_target); 


struct proc_dir_entry *fld_type_proc_dir = NULL;



#ifdef LPROCFS

#if defined (CONFIG_PROC_FS)

static int fld_client_proc_init(struct lu_client_fld *fld)

{

	int rc;

drivers/staging/lustre/lustre/include/dt_object.h

+2 −2
Original line number Diff line number Diff line
@@ -1481,7 +1481,7 @@ static inline struct dt_thread_info *dt_info(const struct lu_env *env) 
int dt_global_init(void);

void dt_global_fini(void);



# ifdef LPROCFS

#if defined (CONFIG_PROC_FS)

int lprocfs_dt_rd_blksize(char *page, char **start, off_t off,

			  int count, int *eof, void *data);

int lprocfs_dt_rd_kbytestotal(char *page, char **start, off_t off,
@@ -1494,6 +1494,6 @@ int lprocfs_dt_rd_filestotal(char *page, char **start, off_t off, 
			     int count, int *eof, void *data);

int lprocfs_dt_rd_filesfree(char *page, char **start, off_t off,

			    int count, int *eof, void *data);

# endif /* LPROCFS */

#endif /* CONFIG_PROC_FS */



#endif /* __LUSTRE_DT_OBJECT_H */