lkml.org 
[lkml]   [2007]   [Feb]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[RFC 6/28] Add struct vfsmount parameter to vfs_mkdir()
    Add struct vfsmount parameter to vfs_mkdir()

    Signed-off-by: Tony Jones <tonyj@suse.de>
    Signed-off-by: Andreas Gruenbacher <agruen@suse.de>

    Index: linux-2.6/fs/ecryptfs/inode.c
    ===================================================================
    --- linux-2.6.orig/fs/ecryptfs/inode.c
    +++ linux-2.6/fs/ecryptfs/inode.c
    @@ -501,11 +501,14 @@ static int ecryptfs_mkdir(struct inode *
    {
    int rc;
    struct dentry *lower_dentry;
    + struct vfsmount *lower_mnt;
    struct dentry *lower_dir_dentry;

    lower_dentry = ecryptfs_dentry_to_lower(dentry);
    + lower_mnt = ecryptfs_dentry_to_lower_mnt(dentry);
    lower_dir_dentry = lock_parent(lower_dentry);
    - rc = vfs_mkdir(lower_dir_dentry->d_inode, lower_dentry, mode);
    + rc = vfs_mkdir(lower_dir_dentry->d_inode, lower_dentry, lower_mnt,
    + mode);
    if (rc || !lower_dentry->d_inode)
    goto out;
    rc = ecryptfs_interpose(lower_dentry, dentry, dir->i_sb, 0);
    Index: linux-2.6/fs/namei.c
    ===================================================================
    --- linux-2.6.orig/fs/namei.c
    +++ linux-2.6/fs/namei.c
    @@ -1916,7 +1916,8 @@ asmlinkage long sys_mknod(const char __u
    return sys_mknodat(AT_FDCWD, filename, mode, dev);
    }

    -int vfs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
    +int vfs_mkdir(struct inode *dir, struct dentry *dentry, struct vfsmount *mnt,
    + int mode)
    {
    int error = may_create(dir, dentry, NULL);

    @@ -1960,7 +1961,7 @@ asmlinkage long sys_mkdirat(int dfd, con

    if (!IS_POSIXACL(nd.dentry->d_inode))
    mode &= ~current->fs->umask;
    - error = vfs_mkdir(nd.dentry->d_inode, dentry, mode);
    + error = vfs_mkdir(nd.dentry->d_inode, dentry, nd.mnt, mode);
    dput(dentry);
    out_unlock:
    mutex_unlock(&nd.dentry->d_inode->i_mutex);
    Index: linux-2.6/fs/nfsd/nfs4recover.c
    ===================================================================
    --- linux-2.6.orig/fs/nfsd/nfs4recover.c
    +++ linux-2.6/fs/nfsd/nfs4recover.c
    @@ -156,7 +156,7 @@ nfsd4_create_clid_dir(struct nfs4_client
    dprintk("NFSD: nfsd4_create_clid_dir: DIRECTORY EXISTS\n");
    goto out_put;
    }
    - status = vfs_mkdir(rec_dir.dentry->d_inode, dentry, S_IRWXU);
    + status = vfs_mkdir(rec_dir.dentry->d_inode, dentry, NULL, S_IRWXU);
    out_put:
    dput(dentry);
    out_unlock:
    Index: linux-2.6/fs/nfsd/vfs.c
    ===================================================================
    --- linux-2.6.orig/fs/nfsd/vfs.c
    +++ linux-2.6/fs/nfsd/vfs.c
    @@ -1183,7 +1183,7 @@ nfsd_create(struct svc_rqst *rqstp, stru
    host_err = vfs_create(dirp, dchild, iap->ia_mode, NULL);
    break;
    case S_IFDIR:
    - host_err = vfs_mkdir(dirp, dchild, iap->ia_mode);
    + host_err = vfs_mkdir(dirp, dchild, NULL, iap->ia_mode);
    break;
    case S_IFCHR:
    case S_IFBLK:
    Index: linux-2.6/include/linux/fs.h
    ===================================================================
    --- linux-2.6.orig/include/linux/fs.h
    +++ linux-2.6/include/linux/fs.h
    @@ -979,7 +979,7 @@ extern void unlock_super(struct super_bl
    */
    extern int vfs_permission(struct nameidata *, int);
    extern int vfs_create(struct inode *, struct dentry *, int, struct nameidata *);
    -extern int vfs_mkdir(struct inode *, struct dentry *, int);
    +extern int vfs_mkdir(struct inode *, struct dentry *, struct vfsmount *, int);
    extern int vfs_mknod(struct inode *, struct dentry *, int, dev_t);
    extern int vfs_symlink(struct inode *, struct dentry *, const char *, int);
    extern int vfs_link(struct dentry *, struct inode *, struct dentry *);
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/
    \
     
     \ /
      Last update: 2007-02-05 19:41    [W:0.023 / U:211.460 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site