From: David Howells <dhowells@redhat.com>
To: viro@ftp.linux.org.uk
Cc: kwc@citi.umich.edu, Trond.Myklebust@netapp.com,
linux-kernel@vger.kernel.org, dhowells@redhat.com
Subject: [PATCH 30/52] CRED: Give the rmdir() inode op a credentials pointer
Date: Fri, 12 Oct 2007 17:07:52 +0100 [thread overview]
Message-ID: <20071012160752.15119.58526.stgit@warthog.procyon.org.uk> (raw)
In-Reply-To: <20071012160519.15119.69608.stgit@warthog.procyon.org.uk>
Give the rmdir() inode op a credentials pointer.
Signed-off-by: David Howells <dhowells@redhat.com>
---
fs/afs/dir.c | 6 ++++--
fs/autofs4/root.c | 5 +++--
fs/bad_inode.c | 3 ++-
fs/ext3/namei.c | 4 ++--
fs/libfs.c | 4 +---
fs/namei.c | 3 ++-
fs/nfs/dir.c | 6 +++---
fs/vfat/namei.c | 3 ++-
include/linux/fs.h | 4 ++--
mm/shmem.c | 4 ++--
net/sunrpc/rpc_pipe.c | 6 ++++--
security/inode.c | 2 +-
12 files changed, 28 insertions(+), 22 deletions(-)
diff --git a/fs/afs/dir.c b/fs/afs/dir.c
index b6d5abb..9f2c214 100644
--- a/fs/afs/dir.c
+++ b/fs/afs/dir.c
@@ -32,7 +32,8 @@ static int afs_create(struct inode *dir, struct dentry *dentry, int mode,
struct nameidata *nd, struct cred *cred);
static int afs_mkdir(struct inode *dir, struct dentry *dentry, int mode,
struct cred *cred);
-static int afs_rmdir(struct inode *dir, struct dentry *dentry);
+static int afs_rmdir(struct inode *dir, struct dentry *dentry,
+ struct cred *cred);
static int afs_unlink(struct inode *dir, struct dentry *dentry,
struct cred *cred);
static int afs_link(struct dentry *from, struct inode *dir,
@@ -794,7 +795,8 @@ error:
/*
* remove a directory from an AFS filesystem
*/
-static int afs_rmdir(struct inode *dir, struct dentry *dentry)
+static int afs_rmdir(struct inode *dir, struct dentry *dentry,
+ struct cred *cred)
{
struct afs_vnode *dvnode, *vnode;
struct key *key;
diff --git a/fs/autofs4/root.c b/fs/autofs4/root.c
index 747a51f..1743d38 100644
--- a/fs/autofs4/root.c
+++ b/fs/autofs4/root.c
@@ -21,7 +21,7 @@
static int autofs4_dir_symlink(struct inode *,struct dentry *,const char *);
static int autofs4_dir_unlink(struct inode *,struct dentry *, struct cred *);
-static int autofs4_dir_rmdir(struct inode *,struct dentry *);
+static int autofs4_dir_rmdir(struct inode *,struct dentry *, struct cred *);
static int autofs4_dir_mkdir(struct inode *,struct dentry *,int, struct cred *);
static int autofs4_root_ioctl(struct inode *, struct file *,unsigned int,unsigned long);
static int autofs4_dir_open(struct inode *inode, struct file *file);
@@ -790,7 +790,8 @@ static int autofs4_dir_unlink(struct inode *dir, struct dentry *dentry,
return 0;
}
-static int autofs4_dir_rmdir(struct inode *dir, struct dentry *dentry)
+static int autofs4_dir_rmdir(struct inode *dir, struct dentry *dentry,
+ struct cred *cred)
{
struct autofs_sb_info *sbi = autofs4_sbi(dir->i_sb);
struct autofs_info *ino = autofs4_dentry_ino(dentry);
diff --git a/fs/bad_inode.c b/fs/bad_inode.c
index 0b0a787..79d8856 100644
--- a/fs/bad_inode.c
+++ b/fs/bad_inode.c
@@ -221,7 +221,8 @@ static int bad_inode_mkdir(struct inode *dir, struct dentry *dentry,
return -EIO;
}
-static int bad_inode_rmdir (struct inode *dir, struct dentry *dentry)
+static int bad_inode_rmdir (struct inode *dir, struct dentry *dentry,
+ struct cred *cred)
{
return -EIO;
}
diff --git a/fs/ext3/namei.c b/fs/ext3/namei.c
index f0e3303..b54b60a 100644
--- a/fs/ext3/namei.c
+++ b/fs/ext3/namei.c
@@ -2080,9 +2080,9 @@ out_brelse:
goto out_err;
}
-static int ext3_rmdir (struct inode * dir, struct dentry *dentry)
+static int ext3_rmdir (struct inode * dir, struct dentry *dentry,
+ struct cred *cred)
{
- struct cred *cred = current->cred;
int retval;
struct inode * inode;
struct buffer_head * bh;
diff --git a/fs/libfs.c b/fs/libfs.c
index d4cab7a..f237ef3 100644
--- a/fs/libfs.c
+++ b/fs/libfs.c
@@ -294,10 +294,8 @@ int simple_unlink(struct inode *dir, struct dentry *dentry, struct cred *cred)
return 0;
}
-int simple_rmdir(struct inode *dir, struct dentry *dentry)
+int simple_rmdir(struct inode *dir, struct dentry *dentry, struct cred *cred)
{
- struct cred *cred = current->cred;
-
if (!simple_empty(dentry))
return -ENOTEMPTY;
diff --git a/fs/namei.c b/fs/namei.c
index fe94ef5..b991b32 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -2058,6 +2058,7 @@ void dentry_unhash(struct dentry *dentry)
int vfs_rmdir(struct inode *dir, struct dentry *dentry)
{
+ struct cred *cred = current->cred;
int error = may_delete(dir, dentry, 1);
if (error)
@@ -2075,7 +2076,7 @@ int vfs_rmdir(struct inode *dir, struct dentry *dentry)
else {
error = security_inode_rmdir(dir, dentry);
if (!error) {
- error = dir->i_op->rmdir(dir, dentry);
+ error = dir->i_op->rmdir(dir, dentry, cred);
if (!error)
dentry->d_inode->i_flags |= S_DEAD;
}
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
index 5c1f1d4..447a364 100644
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
@@ -47,7 +47,7 @@ static struct dentry *nfs_lookup(struct inode *, struct dentry *, struct nameida
static int nfs_create(struct inode *, struct dentry *, int, struct nameidata *,
struct cred *);
static int nfs_mkdir(struct inode *, struct dentry *, int, struct cred *);
-static int nfs_rmdir(struct inode *, struct dentry *);
+static int nfs_rmdir(struct inode *, struct dentry *, struct cred *);
static int nfs_unlink(struct inode *, struct dentry *, struct cred *);
static int nfs_symlink(struct inode *, struct dentry *, const char *);
static int nfs_link(struct dentry *, struct inode *, struct dentry *,
@@ -1348,9 +1348,9 @@ out_err:
return error;
}
-static int nfs_rmdir(struct inode *dir, struct dentry *dentry)
+static int nfs_rmdir(struct inode *dir, struct dentry *dentry,
+ struct cred *acred)
{
- struct cred *acred = current->cred;
int error;
dfprintk(VFS, "NFS: rmdir(%s/%ld), %s\n",
diff --git a/fs/vfat/namei.c b/fs/vfat/namei.c
index 434ffdf..f4bab9d 100644
--- a/fs/vfat/namei.c
+++ b/fs/vfat/namei.c
@@ -764,7 +764,8 @@ out:
return err;
}
-static int vfat_rmdir(struct inode *dir, struct dentry *dentry)
+static int vfat_rmdir(struct inode *dir, struct dentry *dentry,
+ struct cred *cred)
{
struct inode *inode = dentry->d_inode;
struct fat_slot_info sinfo;
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 62df85a..f7838e9 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1143,7 +1143,7 @@ struct inode_operations {
int (*unlink) (struct inode *,struct dentry *, struct cred *);
int (*symlink) (struct inode *,struct dentry *,const char *);
int (*mkdir) (struct inode *,struct dentry *,int, struct cred *);
- int (*rmdir) (struct inode *,struct dentry *);
+ int (*rmdir) (struct inode *,struct dentry *, struct cred *);
int (*mknod) (struct inode *,struct dentry *,int,dev_t, struct cred *);
int (*rename) (struct inode *, struct dentry *,
struct inode *, struct dentry *);
@@ -1798,7 +1798,7 @@ extern int simple_statfs(struct dentry *, struct kstatfs *);
extern int simple_link(struct dentry *, struct inode *, struct dentry *,
struct cred *);
extern int simple_unlink(struct inode *, struct dentry *, struct cred *);
-extern int simple_rmdir(struct inode *, struct dentry *);
+extern int simple_rmdir(struct inode *, struct dentry *, struct cred *);
extern int simple_rename(struct inode *, struct dentry *, struct inode *, struct dentry *);
extern int simple_sync_file(struct file *, struct dentry *, int);
extern int simple_empty(struct dentry *);
diff --git a/mm/shmem.c b/mm/shmem.c
index 1e3c4e7..d0e2db8 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -1811,9 +1811,9 @@ static int shmem_unlink(struct inode *dir, struct dentry *dentry,
return 0;
}
-static int shmem_rmdir(struct inode *dir, struct dentry *dentry)
+static int shmem_rmdir(struct inode *dir, struct dentry *dentry,
+ struct cred *cred)
{
- struct cred *cred = current->cred;
if (!simple_empty(dentry))
return -ENOTEMPTY;
diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c
index 1906ee1..c38cc0d 100644
--- a/net/sunrpc/rpc_pipe.c
+++ b/net/sunrpc/rpc_pipe.c
@@ -547,7 +547,7 @@ repeat:
if (S_ISREG(dentry->d_inode->i_mode))
simple_unlink(dir, dentry, cred);
else if (S_ISDIR(dentry->d_inode->i_mode))
- simple_rmdir(dir, dentry);
+ simple_rmdir(dir, dentry, cred);
d_delete(dentry);
dput(dentry);
} while (n);
@@ -618,8 +618,10 @@ out_err:
static int
__rpc_rmdir(struct inode *dir, struct dentry *dentry)
{
+ struct cred *cred = current->cred;
int error;
- error = simple_rmdir(dir, dentry);
+
+ error = simple_rmdir(dir, dentry, cred);
if (!error)
d_delete(dentry);
return error;
diff --git a/security/inode.c b/security/inode.c
index 1eaaf3d..0ea9f41 100644
--- a/security/inode.c
+++ b/security/inode.c
@@ -305,7 +305,7 @@ void securityfs_remove(struct dentry *dentry)
if (positive(dentry)) {
if (dentry->d_inode) {
if (S_ISDIR(dentry->d_inode->i_mode))
- simple_rmdir(parent->d_inode, dentry);
+ simple_rmdir(parent->d_inode, dentry, cred);
else
simple_unlink(parent->d_inode, dentry, cred);
dput(dentry);
next prev parent reply other threads:[~2007-10-12 16:21 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-10-12 16:05 [PATCH 00/52] Introduce credential record David Howells
2007-10-12 16:05 ` [PATCH 01/52] CRED: Introduce a COW credentials record David Howells
2007-10-15 1:53 ` David Chinner
2007-10-12 16:05 ` [PATCH 02/52] CRED: Give in_group_p() a cred pointer David Howells
2007-10-12 16:05 ` [PATCH 03/52] CRED: Pass credentials down to ext3 block allocator David Howells
2007-10-12 16:05 ` [PATCH 04/52] CRED: Pass credentials down to ext3 inode allocator David Howells
2007-10-12 16:05 ` [PATCH 05/52] CRED: Prepare TMPFS for cred passing David Howells
2007-10-12 16:05 ` [PATCH 06/52] CRED: Prepare RAMFS " David Howells
2007-10-12 16:05 ` [PATCH 07/52] CRED: Pass credentials down to ext2 block allocator David Howells
2007-10-12 16:06 ` [PATCH 08/52] CRED: Pass credentials down to ext2 inode allocator David Howells
2007-10-12 16:06 ` [PATCH 09/52] CRED: Pass credentials down to ext4 block allocator David Howells
2007-10-12 16:06 ` [PATCH 10/52] CRED: Pass credentials down to ext4 inode allocator David Howells
2007-10-12 16:06 ` [PATCH 11/52] CRED: Give the get_block() callback a credentials pointer David Howells
2007-10-12 16:06 ` [PATCH 12/52] CRED: Make mpage read functions take " David Howells
2007-10-12 16:06 ` [PATCH 13/52] CRED: Make block_prepare_write() and co " David Howells
2007-10-12 16:06 ` [PATCH 14/52] CRED: Provide a writeback credentials record David Howells
2007-10-12 16:06 ` [PATCH 15/52] CRED: Make Ext3 use the writeback credentials David Howells
2007-10-12 16:06 ` [PATCH 16/52] CRED: Pass credentials through the internals of ext3 truncation David Howells
2007-10-12 16:06 ` [PATCH 17/52] CRED: Make rpcauth_lookupcred() take a credentials pointer David Howells
2007-10-12 16:06 ` [PATCH 18/52] CRED: Make rpcauth_bindcred() " David Howells
2007-10-12 16:06 ` [PATCH 19/52] CRED: Add a credentials pointer to struct rpc_task David Howells
2007-10-12 16:07 ` [PATCH 20/52] CRED: Pass credentials into rpc_init_task() David Howells
2007-10-12 16:07 ` [PATCH 21/52] CRED: Pass credentials through the truncate() inode operation David Howells
2007-10-12 16:07 ` [PATCH 22/52] CRED: Pass credentials to nfs_setattr_update_inode() David Howells
2007-10-12 16:07 ` [PATCH 23/52] CRED: Pass credentials to the setattr() inode operation David Howells
2007-10-12 16:07 ` [PATCH 24/52] CRED: Pass credentials through inode_setattr() David Howells
2007-10-12 16:07 ` [PATCH 25/52] CRED: Give the mknod() inode op a credentials pointer David Howells
2007-10-12 16:07 ` [PATCH 26/52] CRED: Give the mkdir() " David Howells
2007-10-12 16:07 ` [PATCH 27/52] CRED: Give the create() " David Howells
2007-10-12 16:07 ` [PATCH 28/52] CRED: Give the link() " David Howells
2007-10-12 16:07 ` [PATCH 29/52] CRED: Give the unlink() " David Howells
2007-10-12 16:07 ` David Howells [this message]
2007-10-12 16:07 ` [PATCH 31/52] CRED: Give the rename() " David Howells
2007-10-12 16:08 ` [PATCH 32/52] CRED: Give the symlink() " David Howells
2007-10-12 16:08 ` [PATCH 33/52] CRED: Make the get_parent() export op take a credential pointer David Howells
2007-10-12 16:08 ` [PATCH 34/52] CRED: Make Ext3 ACL set handlers pass credentials down David Howells
2007-10-12 16:08 ` [PATCH 35/52] CRED: Make the ACL set() handler take a credentials pointer David Howells
2007-10-12 16:08 ` [PATCH 36/52] CRED: Make ext3_fill_super() pass credentials down David Howells
2007-10-12 16:08 ` [PATCH 37/52] CRED: Pass credentials to the get_sb() op and various fill_super() ops David Howells
2007-10-12 16:08 ` [PATCH 38/52] CRED: Pass credentials through the quota_read() op David Howells
2007-10-12 16:08 ` [PATCH 39/52] CRED: Pass credentials through the quota_write() op David Howells
2007-10-12 16:08 ` [PATCH 40/52] CRED: Give the lookup() inode op a credentials pointer David Howells
2007-10-12 16:08 ` [PATCH 41/52] CRED: Pass credentials through d_revalidate() David Howells
2007-10-12 16:08 ` [PATCH 42/52] CRED: Pass credentials through the permission() inode op David Howells
2007-10-12 16:08 ` [PATCH 43/52] CRED: Pass credentials through the statfs() superblock op David Howells
2007-10-12 16:09 ` [PATCH 44/52] CRED: Pass credentials through the follow_link() inode op David Howells
2007-10-12 16:09 ` [PATCH 45/52] CRED: Pass credentials through the getattr() " David Howells
2007-10-12 16:09 ` [PATCH 46/52] CRED: Pass credentials through the setxattr() " David Howells
2007-10-12 16:09 ` [PATCH 47/52] CRED: Pass credentials through the xattr get() handler David Howells
2007-10-12 16:09 ` [PATCH 48/52] CRED: Pass credentials through the getxattr() inode op David Howells
2007-10-12 16:09 ` [PATCH 49/52] CRED: Pass credentials through the xattr list() handler David Howells
2007-10-12 16:09 ` [PATCH 50/52] CRED: Pass credentials through the listxattr() inode op David Howells
2007-10-12 16:09 ` [PATCH 51/52] CRED: Pass credentials through the removexattr() " David Howells
2007-10-12 16:09 ` [PATCH 52/52] CRED: Pass credentials through vfs_mkdir() David Howells
2007-10-13 18:11 ` [PATCH 00/52] Introduce credential record Theodore Tso
2007-10-13 18:19 ` Al Viro
2007-10-13 21:46 ` David Howells
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20071012160752.15119.58526.stgit@warthog.procyon.org.uk \
--to=dhowells@redhat.com \
--cc=Trond.Myklebust@netapp.com \
--cc=kwc@citi.umich.edu \
--cc=linux-kernel@vger.kernel.org \
--cc=viro@ftp.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®