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

staging: lustre: remove l_file define 



It's a "file" structure, so use it instead of trying to rename it.

Cc: Andreas Dilger <andreas.dilger@intel.com>
Cc: Oleg Drokin <oleg.drokin@intel.com>
Cc: hpdd-discuss <hpdd-discuss@lists.01.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 178b6901

drivers/staging/lustre/lustre/include/linux/lvfs_linux.h

+1 −3
Original line number Diff line number Diff line
@@ -43,12 +43,10 @@ 


#include "../lvfs.h"



#define l_file file



#define l_filp_open filp_open



struct lvfs_run_ctxt;

struct l_file *l_dentry_open(struct lvfs_run_ctxt *, struct dentry *,

struct file *l_dentry_open(struct lvfs_run_ctxt *, struct dentry *,

			     int flags);



struct l_linux_dirent {

drivers/staging/lustre/lustre/lvfs/lvfs_linux.c

+2 −2
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ put_old: 
EXPORT_SYMBOL(lustre_rename);



/* Note: dput(dchild) will *not* be called if there is an error */

struct l_file *l_dentry_open(struct lvfs_run_ctxt *ctxt, struct dentry *de,

struct file *l_dentry_open(struct lvfs_run_ctxt *ctxt, struct dentry *de,

			   int flags)

{

	struct path path = {

drivers/staging/lustre/lustre/obdclass/llog_lvfs.c

+4 −4
Original line number Diff line number Diff line
@@ -58,8 +58,8 @@ 


#if  defined(LLOG_LVFS)



static int llog_lvfs_pad(struct obd_device *obd, struct l_file *file,

				int len, int index)

static int llog_lvfs_pad(struct obd_device *obd, struct file *file, int len,

			 int index)

{

	struct llog_rec_hdr rec = { 0 };

	struct llog_rec_tail tail;
@@ -88,7 +88,7 @@ static int llog_lvfs_pad(struct obd_device *obd, struct l_file *file, 
	return rc;

}



static int llog_lvfs_write_blob(struct obd_device *obd, struct l_file *file,

static int llog_lvfs_write_blob(struct obd_device *obd, struct file *file,

				struct llog_rec_hdr *rec, void *buf, loff_t off)

{

	int rc;
@@ -140,7 +140,7 @@ static int llog_lvfs_write_blob(struct obd_device *obd, struct l_file *file, 
	return rc;

}



static int llog_lvfs_read_blob(struct obd_device *obd, struct l_file *file,

static int llog_lvfs_read_blob(struct obd_device *obd, struct file *file,

				void *buf, int size, loff_t off)

{

	loff_t offset = off;

CRA Git | Maintained and supported by SUSTech CRA and CCSE