From 30082b9da111762e932cd45d8435cb3948ed5280 Mon Sep 17 00:00:00 2001 From: yangsheng Date: Thu, 24 Jul 2008 14:56:27 +0000 Subject: [PATCH] Branch b1_8_gate b=15308 i=johann, shadow, zhenyu.xu, brian Update to SLES10 SP2 kernel-2.6.16.60-0.23 and update to OFED-1.3.1. --- lustre/lvfs/lvfs_linux.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/lustre/lvfs/lvfs_linux.c b/lustre/lvfs/lvfs_linux.c index e39b8a1..2b3de8f 100644 --- a/lustre/lvfs/lvfs_linux.c +++ b/lustre/lvfs/lvfs_linux.c @@ -282,7 +282,8 @@ out_up: EXPORT_SYMBOL(simple_mknod); /* utility to make a directory */ -struct dentry *simple_mkdir(struct dentry *dir, char *name, int mode, int fix) +struct dentry *simple_mkdir(struct dentry *dir, struct vfsmount *mnt, + char *name, int mode, int fix) { struct dentry *dchild; int err = 0; @@ -315,7 +316,7 @@ struct dentry *simple_mkdir(struct dentry *dir, char *name, int mode, int fix) GOTO(out_up, dchild); } - err = vfs_mkdir(dir->d_inode, dchild, mode); + err = ll_vfs_mkdir(dir->d_inode, dchild, mnt, mode); if (err) GOTO(out_err, err); @@ -330,7 +331,8 @@ out_up: EXPORT_SYMBOL(simple_mkdir); /* utility to rename a file */ -int lustre_rename(struct dentry *dir, char *oldname, char *newname) +int lustre_rename(struct dentry *dir, struct vfsmount *mnt, + char *oldname, char *newname) { struct dentry *dchild_old, *dchild_new; int err = 0; @@ -351,7 +353,8 @@ int lustre_rename(struct dentry *dir, char *oldname, char *newname) if (IS_ERR(dchild_new)) GOTO(put_old, err = PTR_ERR(dchild_new)); - err = vfs_rename(dir->d_inode, dchild_old, dir->d_inode, dchild_new); + err = ll_vfs_rename(dir->d_inode, dchild_old, mnt, + dir->d_inode, dchild_new, mnt); dput(dchild_new); put_old: -- 1.8.3.1