1
Add struct vfsmount parameter to vfs_mkdir()
3
Signed-off-by: Tony Jones <tonyj@suse.de>
4
Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
6
Index: b/fs/ecryptfs/inode.c
7
===================================================================
8
--- a/fs/ecryptfs/inode.c
9
+++ b/fs/ecryptfs/inode.c
10
@@ -512,11 +512,14 @@ static int ecryptfs_mkdir(struct inode *
13
struct dentry *lower_dentry;
14
+ struct vfsmount *lower_mnt;
15
struct dentry *lower_dir_dentry;
17
lower_dentry = ecryptfs_dentry_to_lower(dentry);
18
+ lower_mnt = ecryptfs_dentry_to_lower_mnt(dentry);
19
lower_dir_dentry = lock_parent(lower_dentry);
20
- rc = vfs_mkdir(lower_dir_dentry->d_inode, lower_dentry, mode);
21
+ rc = vfs_mkdir(lower_dir_dentry->d_inode, lower_dentry, lower_mnt,
23
if (rc || !lower_dentry->d_inode)
25
rc = ecryptfs_interpose(lower_dentry, dentry, dir->i_sb, 0);
27
===================================================================
30
@@ -1916,7 +1916,8 @@ asmlinkage long sys_mknod(const char __u
31
return sys_mknodat(AT_FDCWD, filename, mode, dev);
34
-int vfs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
35
+int vfs_mkdir(struct inode *dir, struct dentry *dentry, struct vfsmount *mnt,
38
int error = may_create(dir, dentry, NULL);
40
@@ -1960,7 +1961,7 @@ asmlinkage long sys_mkdirat(int dfd, con
42
if (!IS_POSIXACL(nd.dentry->d_inode))
43
mode &= ~current->fs->umask;
44
- error = vfs_mkdir(nd.dentry->d_inode, dentry, mode);
45
+ error = vfs_mkdir(nd.dentry->d_inode, dentry, nd.mnt, mode);
48
mutex_unlock(&nd.dentry->d_inode->i_mutex);
49
Index: b/fs/nfsd/nfs4recover.c
50
===================================================================
51
--- a/fs/nfsd/nfs4recover.c
52
+++ b/fs/nfsd/nfs4recover.c
53
@@ -156,7 +156,8 @@ nfsd4_create_clid_dir(struct nfs4_client
54
dprintk("NFSD: nfsd4_create_clid_dir: DIRECTORY EXISTS\n");
57
- status = vfs_mkdir(rec_dir.dentry->d_inode, dentry, S_IRWXU);
58
+ status = vfs_mkdir(rec_dir.dentry->d_inode, dentry, rec_dir.mnt,
63
Index: b/fs/nfsd/vfs.c
64
===================================================================
67
@@ -1183,7 +1183,8 @@ nfsd_create(struct svc_rqst *rqstp, stru
68
host_err = vfs_create(dirp, dchild, iap->ia_mode, NULL);
71
- host_err = vfs_mkdir(dirp, dchild, iap->ia_mode);
72
+ host_err = vfs_mkdir(dirp, dchild, fhp->fh_export->ex_mnt,
77
Index: b/include/linux/fs.h
78
===================================================================
79
--- a/include/linux/fs.h
80
+++ b/include/linux/fs.h
81
@@ -980,7 +980,7 @@ extern void unlock_super(struct super_bl
83
extern int vfs_permission(struct nameidata *, int);
84
extern int vfs_create(struct inode *, struct dentry *, int, struct nameidata *);
85
-extern int vfs_mkdir(struct inode *, struct dentry *, int);
86
+extern int vfs_mkdir(struct inode *, struct dentry *, struct vfsmount *, int);
87
extern int vfs_mknod(struct inode *, struct dentry *, int, dev_t);
88
extern int vfs_symlink(struct inode *, struct dentry *, const char *, int);
89
extern int vfs_link(struct dentry *, struct inode *, struct dentry *);