lkml.org 
[lkml]   [2007]   [May]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[AppArmor 14/45] Add a struct vfsmount parameter to vfs_rmdir()
    The vfsmount will be passed down to the LSM hook so that LSMs can compute
    pathnames.

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

    ---
    fs/ecryptfs/inode.c | 4 +++-
    fs/namei.c | 4 ++--
    fs/nfsd/nfs4recover.c | 2 +-
    fs/nfsd/vfs.c | 8 +++++---
    fs/reiserfs/xattr.c | 2 +-
    include/linux/fs.h | 2 +-
    6 files changed, 13 insertions(+), 9 deletions(-)

    --- a/fs/ecryptfs/inode.c
    +++ b/fs/ecryptfs/inode.c
    @@ -542,14 +542,16 @@ out:
    static int ecryptfs_rmdir(struct inode *dir, struct dentry *dentry)
    {
    struct dentry *lower_dentry;
    + struct vfsmount *lower_mnt;
    struct dentry *lower_dir_dentry;
    int rc;

    lower_dentry = ecryptfs_dentry_to_lower(dentry);
    + lower_mnt = ecryptfs_dentry_to_lower_mnt(dentry);
    dget(dentry);
    lower_dir_dentry = lock_parent(lower_dentry);
    dget(lower_dentry);
    - rc = vfs_rmdir(lower_dir_dentry->d_inode, lower_dentry);
    + rc = vfs_rmdir(lower_dir_dentry->d_inode, lower_dentry, lower_mnt);
    dput(lower_dentry);
    if (!rc)
    d_delete(lower_dentry);
    --- a/fs/namei.c
    +++ b/fs/namei.c
    @@ -2024,7 +2024,7 @@ void dentry_unhash(struct dentry *dentry
    spin_unlock(&dcache_lock);
    }

    -int vfs_rmdir(struct inode *dir, struct dentry *dentry)
    +int vfs_rmdir(struct inode *dir, struct dentry *dentry,struct vfsmount *mnt)
    {
    int error = may_delete(dir, dentry, 1);

    @@ -2088,7 +2088,7 @@ static long do_rmdir(int dfd, const char
    error = PTR_ERR(dentry);
    if (IS_ERR(dentry))
    goto exit2;
    - error = vfs_rmdir(nd.dentry->d_inode, dentry);
    + error = vfs_rmdir(nd.dentry->d_inode, dentry, nd.mnt);
    dput(dentry);
    exit2:
    mutex_unlock(&nd.dentry->d_inode->i_mutex);
    --- a/fs/nfsd/nfs4recover.c
    +++ b/fs/nfsd/nfs4recover.c
    @@ -276,7 +276,7 @@ nfsd4_clear_clid_dir(struct dentry *dir,
    * a kernel from the future.... */
    nfsd4_list_rec_dir(dentry, nfsd4_remove_clid_file);
    mutex_lock_nested(&dir->d_inode->i_mutex, I_MUTEX_PARENT);
    - status = vfs_rmdir(dir->d_inode, dentry);
    + status = vfs_rmdir(dir->d_inode, dentry, rec_dir.mnt);
    mutex_unlock(&dir->d_inode->i_mutex);
    return status;
    }
    --- a/fs/nfsd/vfs.c
    +++ b/fs/nfsd/vfs.c
    @@ -1666,6 +1666,7 @@ nfsd_unlink(struct svc_rqst *rqstp, stru
    char *fname, int flen)
    {
    struct dentry *dentry, *rdentry;
    + struct svc_export *exp;
    struct inode *dirp;
    __be32 err;
    int host_err;
    @@ -1680,6 +1681,7 @@ nfsd_unlink(struct svc_rqst *rqstp, stru
    fh_lock_nested(fhp, I_MUTEX_PARENT);
    dentry = fhp->fh_dentry;
    dirp = dentry->d_inode;
    + exp = fhp->fh_export;

    rdentry = lookup_one_len(fname, dentry, flen);
    host_err = PTR_ERR(rdentry);
    @@ -1697,21 +1699,21 @@ nfsd_unlink(struct svc_rqst *rqstp, stru

    if (type != S_IFDIR) { /* It's UNLINK */
    #ifdef MSNFS
    - if ((fhp->fh_export->ex_flags & NFSEXP_MSNFS) &&
    + if ((exp->ex_flags & NFSEXP_MSNFS) &&
    (atomic_read(&rdentry->d_count) > 1)) {
    host_err = -EPERM;
    } else
    #endif
    host_err = vfs_unlink(dirp, rdentry);
    } else { /* It's RMDIR */
    - host_err = vfs_rmdir(dirp, rdentry);
    + host_err = vfs_rmdir(dirp, rdentry, exp->ex_mnt);
    }

    dput(rdentry);

    if (host_err)
    goto out_nfserr;
    - if (EX_ISSYNC(fhp->fh_export))
    + if (EX_ISSYNC(exp))
    host_err = nfsd_sync_dir(dentry);

    out_nfserr:
    --- a/fs/reiserfs/xattr.c
    +++ b/fs/reiserfs/xattr.c
    @@ -775,7 +775,7 @@ int reiserfs_delete_xattrs(struct inode
    if (dir->d_inode->i_nlink <= 2) {
    root = get_xa_root(inode->i_sb, XATTR_REPLACE);
    reiserfs_write_lock_xattrs(inode->i_sb);
    - err = vfs_rmdir(root->d_inode, dir);
    + err = vfs_rmdir(root->d_inode, dir, NULL);
    reiserfs_write_unlock_xattrs(inode->i_sb);
    dput(root);
    } else {
    --- a/include/linux/fs.h
    +++ b/include/linux/fs.h
    @@ -996,7 +996,7 @@ extern int vfs_mkdir(struct inode *, str
    extern int vfs_mknod(struct inode *, struct dentry *, struct vfsmount *, int, dev_t);
    extern int vfs_symlink(struct inode *, struct dentry *, struct vfsmount *, const char *, int);
    extern int vfs_link(struct dentry *, struct vfsmount *, struct inode *, struct dentry *, struct vfsmount *);
    -extern int vfs_rmdir(struct inode *, struct dentry *);
    +extern int vfs_rmdir(struct inode *, struct dentry *, struct vfsmount *);
    extern int vfs_unlink(struct inode *, struct dentry *);
    extern int vfs_rename(struct inode *, 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-05-14 13:41    [W:0.025 / U:406.436 seconds]
    ©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site