mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-05 17:03:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

staging: lustre: remove l_file define

Browse Source 
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman
2014-07-11 22:56:16 -07:00
parent 178b690132
commit 1668b82116
3 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/staging/lustre/lustre/include/linux/lvfs_linux.h
View File

@@ -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 {

4
drivers/staging/lustre/lustre/lvfs/lvfs_linux.c
View File

@@ -233,8 +233,8 @@ int lustre_rename(struct dentry *dir, struct vfsmount *mnt,
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,
int flags)
struct file *l_dentry_open(struct lvfs_run_ctxt *ctxt, struct dentry *de,
int flags)
{
struct path path = {
.dentry = de,

8
drivers/staging/lustre/lustre/obdclass/llog_lvfs.c
View File

@@ -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;