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
Branch HEAD
[fs/lustre-release.git]
/
lustre
/
lvfs
/
lvfs_linux.c
diff --git
a/lustre/lvfs/lvfs_linux.c
b/lustre/lvfs/lvfs_linux.c
index
d16549b
..
8dbf9e1
100644
(file)
--- a/
lustre/lvfs/lvfs_linux.c
+++ b/
lustre/lvfs/lvfs_linux.c
@@
-16,8
+16,8
@@
* in the LICENSE file that accompanied this code).
*
* You should have received a copy of the GNU General Public License
* in the LICENSE file that accompanied this code).
*
* You should have received a copy of the GNU General Public License
- * version 2 along with this program; If not, see
[sun.com URL with a
- *
copy of GPLv2].
+ * version 2 along with this program; If not, see
+ *
http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
*
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
* CA 95054 USA or visit www.sun.com if you need additional information or
*
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
* CA 95054 USA or visit www.sun.com if you need additional information or
@@
-276,7
+276,8
@@
out_up:
EXPORT_SYMBOL(simple_mknod);
/* utility to make a directory */
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;
{
struct dentry *dchild;
int err = 0;
@@
-309,7
+310,7
@@
struct dentry *simple_mkdir(struct dentry *dir, char *name, int mode, int fix)
GOTO(out_up, dchild);
}
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);
if (err)
GOTO(out_err, err);
@@
-324,7
+325,8
@@
out_up:
EXPORT_SYMBOL(simple_mkdir);
/* utility to rename a file */
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;
{
struct dentry *dchild_old, *dchild_new;
int err = 0;
@@
-345,7
+347,8
@@
int lustre_rename(struct dentry *dir, char *oldname, char *newname)
if (IS_ERR(dchild_new))
GOTO(put_old, err = PTR_ERR(dchild_new));
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:
dput(dchild_new);
put_old: