From: Miklos Szeredi <miklos@szeredi.hu>
To: akpm@linux-foundation.org
Cc: hch@infradead.org, viro@ZenIV.linux.org.uk,
linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [patch 17/24] vfs: add path_rmdir()
Date: Tue, 06 May 2008 11:13:44 +0200 [thread overview]
Message-ID: <20080506091432.483898418@szeredi.hu> (raw)
In-Reply-To: 20080506091327.259950960@szeredi.hu
[-- Attachment #1: path_rmdir.patch --]
[-- Type: text/plain, Size: 5868 bytes --]
From: Miklos Szeredi <mszeredi@suse.cz>
Introduce path_rmdir().
The only user of vfs_rmdir() remaining is reiserfs_delete_xattrs().
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
---
fs/ecryptfs/inode.c | 13 +++++++------
fs/namei.c | 23 +++++++++++++++--------
fs/nfsd/nfs4recover.c | 3 ++-
fs/nfsd/vfs.c | 4 +++-
include/linux/fs.h | 2 +-
5 files changed, 28 insertions(+), 17 deletions(-)
Index: linux-2.6/fs/namei.c
===================================================================
--- linux-2.6.orig/fs/namei.c 2008-05-06 11:04:38.000000000 +0200
+++ linux-2.6/fs/namei.c 2008-05-06 11:04:39.000000000 +0200
@@ -2229,7 +2229,7 @@ void dentry_unhash(struct dentry *dentry
spin_unlock(&dcache_lock);
}
-int vfs_rmdir(struct inode *dir, struct dentry *dentry)
+static int vfs_rmdir(struct inode *dir, struct dentry *dentry)
{
int error = may_delete(dir, dentry, 1);
@@ -2262,6 +2262,19 @@ int vfs_rmdir(struct inode *dir, struct
return error;
}
+int path_rmdir(struct path *dir_path, struct dentry *dentry)
+{
+ int error = mnt_want_write(dir_path->mnt);
+
+ if (!error) {
+ error = vfs_rmdir(dir_path->dentry->d_inode, dentry);
+ mnt_drop_write(dir_path->mnt);
+ }
+
+ return error;
+}
+EXPORT_SYMBOL(path_rmdir);
+
static long do_rmdir(int dfd, const char __user *pathname)
{
int error = 0;
@@ -2293,12 +2306,7 @@ static long do_rmdir(int dfd, const char
error = PTR_ERR(dentry);
if (IS_ERR(dentry))
goto exit2;
- error = mnt_want_write(nd.path.mnt);
- if (error)
- goto exit3;
- error = vfs_rmdir(nd.path.dentry->d_inode, dentry);
- mnt_drop_write(nd.path.mnt);
-exit3:
+ error = path_rmdir(&nd.path, dentry);
dput(dentry);
exit2:
mutex_unlock(&nd.path.dentry->d_inode->i_mutex);
@@ -2993,7 +3001,6 @@ EXPORT_SYMBOL(vfs_link);
EXPORT_SYMBOL(generic_permission);
EXPORT_SYMBOL(vfs_readlink);
EXPORT_SYMBOL(vfs_rename);
-EXPORT_SYMBOL(vfs_rmdir);
EXPORT_SYMBOL(vfs_symlink);
EXPORT_SYMBOL(vfs_unlink);
EXPORT_SYMBOL(dentry_unhash);
Index: linux-2.6/fs/ecryptfs/inode.c
===================================================================
--- linux-2.6.orig/fs/ecryptfs/inode.c 2008-05-06 11:04:38.000000000 +0200
+++ linux-2.6/fs/ecryptfs/inode.c 2008-05-06 11:04:39.000000000 +0200
@@ -502,20 +502,21 @@ out:
static int ecryptfs_rmdir(struct inode *dir, struct dentry *dentry)
{
struct dentry *lower_dentry;
- struct dentry *lower_dir_dentry;
+ struct path lower_dir;
int rc;
lower_dentry = ecryptfs_dentry_to_lower(dentry);
dget(dentry);
- lower_dir_dentry = lock_parent(lower_dentry);
+ lower_dir.mnt = ecryptfs_dentry_to_lower_mnt(dentry);
+ lower_dir.dentry = lock_parent(lower_dentry);
dget(lower_dentry);
- rc = vfs_rmdir(lower_dir_dentry->d_inode, lower_dentry);
+ rc = path_rmdir(&lower_dir, lower_dentry);
dput(lower_dentry);
if (!rc)
d_delete(lower_dentry);
- fsstack_copy_attr_times(dir, lower_dir_dentry->d_inode);
- dir->i_nlink = lower_dir_dentry->d_inode->i_nlink;
- unlock_dir(lower_dir_dentry);
+ fsstack_copy_attr_times(dir, lower_dir.dentry->d_inode);
+ dir->i_nlink = lower_dir.dentry->d_inode->i_nlink;
+ unlock_dir(lower_dir.dentry);
if (!rc)
d_drop(dentry);
dput(dentry);
Index: linux-2.6/fs/nfsd/nfs4recover.c
===================================================================
--- linux-2.6.orig/fs/nfsd/nfs4recover.c 2008-05-06 11:04:38.000000000 +0200
+++ linux-2.6/fs/nfsd/nfs4recover.c 2008-05-06 11:04:39.000000000 +0200
@@ -267,6 +267,7 @@ nfsd4_remove_clid_file(struct dentry *di
static int
nfsd4_clear_clid_dir(struct dentry *dir, struct dentry *dentry)
{
+ struct path dir_path = { .dentry = dir, .mnt = rec_dir.path.mnt };
int status;
/* For now this directory should already be empty, but we empty it of
@@ -274,7 +275,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 = path_rmdir(&dir_path, dentry);
mutex_unlock(&dir->d_inode->i_mutex);
return status;
}
Index: linux-2.6/fs/nfsd/vfs.c
===================================================================
--- linux-2.6.orig/fs/nfsd/vfs.c 2008-05-06 11:04:38.000000000 +0200
+++ linux-2.6/fs/nfsd/vfs.c 2008-05-06 11:04:39.000000000 +0200
@@ -1764,6 +1764,7 @@ __be32
nfsd_unlink(struct svc_rqst *rqstp, struct svc_fh *fhp, int type,
char *fname, int flen)
{
+ struct path dir_path;
struct dentry *dentry, *rdentry;
struct inode *dirp;
__be32 err;
@@ -1798,6 +1799,7 @@ nfsd_unlink(struct svc_rqst *rqstp, stru
if (host_err)
goto out_nfserr;
+ fh_to_path(fhp, &dir_path);
if (type != S_IFDIR) { /* It's UNLINK */
#ifdef MSNFS
if ((fhp->fh_export->ex_flags & NFSEXP_MSNFS) &&
@@ -1807,7 +1809,7 @@ nfsd_unlink(struct svc_rqst *rqstp, stru
#endif
host_err = vfs_unlink(dirp, rdentry);
} else { /* It's RMDIR */
- host_err = vfs_rmdir(dirp, rdentry);
+ host_err = path_rmdir(&dir_path, rdentry);
}
dput(rdentry);
Index: linux-2.6/include/linux/fs.h
===================================================================
--- linux-2.6.orig/include/linux/fs.h 2008-05-06 11:04:38.000000000 +0200
+++ linux-2.6/include/linux/fs.h 2008-05-06 11:04:39.000000000 +0200
@@ -1129,7 +1129,7 @@ extern int path_mkdir(struct path *, str
extern int path_mknod(struct path *, 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 *);
-extern int vfs_rmdir(struct inode *, struct dentry *);
+extern int path_rmdir(struct path *, struct dentry *);
extern int vfs_unlink(struct inode *, struct dentry *);
extern int vfs_rename(struct inode *, struct dentry *, struct inode *, struct dentry *);
--
next prev parent reply other threads:[~2008-05-06 9:21 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-05-06 9:13 [patch 00/24] vfs: fixes and cleanups + add helpers to check r/o bind mounts Miklos Szeredi
2008-05-06 9:13 ` [patch 01/24] nfsd: clean up mnt_want_write calls Miklos Szeredi
2008-05-06 9:13 ` [patch 02/24] cgroup: dont call vfs_mkdir Miklos Szeredi
2008-05-06 9:13 ` [patch 03/24] reiserfs: dont call vfs_rmdir Miklos Szeredi
2008-05-06 9:13 ` [patch 04/24] reiserfs: dont call notify_change Miklos Szeredi
2008-05-08 16:49 ` Christoph Hellwig
2008-05-06 9:13 ` [patch 05/24] sysfs: " Miklos Szeredi
2008-05-08 16:50 ` Christoph Hellwig
2008-05-06 9:13 ` [patch 06/24] hpfs: " Miklos Szeredi
2008-05-08 0:41 ` Mikulas Patocka
2008-05-08 16:52 ` Christoph Hellwig
2008-05-09 1:59 ` Mikulas Patocka
2008-05-06 9:13 ` [patch 07/24] fat: " Miklos Szeredi
2008-05-08 16:57 ` Christoph Hellwig
2008-05-08 18:51 ` Miklos Szeredi
2008-05-08 19:42 ` OGAWA Hirofumi
2008-05-08 23:45 ` James Morris
2008-05-06 9:13 ` [patch 08/24] vfs: immutable inode checking cleanup Miklos Szeredi
2008-05-15 7:23 ` Al Viro
2008-05-15 7:39 ` Miklos Szeredi
2008-05-06 9:13 ` [patch 09/24] vfs: truncate: dont check immutable twice Miklos Szeredi
2008-05-06 9:13 ` [patch 10/24] vfs: truncate: append-only checking cleanup Miklos Szeredi
2008-05-15 7:49 ` Al Viro
2008-05-15 7:58 ` Miklos Szeredi
2008-05-06 9:13 ` [patch 11/24] vfs: create file_truncate() helper Miklos Szeredi
2008-05-06 9:13 ` [patch 12/24] vfs: utimes immutable fix Miklos Szeredi
2008-05-06 9:13 ` [patch 13/24] vfs: utimes cleanup Miklos Szeredi
2008-05-06 10:03 ` Miklos Szeredi
2008-05-15 7:39 ` Al Viro
2008-05-15 7:45 ` Miklos Szeredi
2008-05-06 9:13 ` [patch 14/24] vfs: splice remove_suid() cleanup Miklos Szeredi
2008-05-06 9:13 ` [patch 15/24] vfs: add path_create() and path_mknod() Miklos Szeredi
2008-05-06 9:13 ` [patch 16/24] vfs: add path_mkdir() Miklos Szeredi
2008-05-06 9:13 ` Miklos Szeredi [this message]
2008-05-06 9:13 ` [patch 18/24] vfs: add path_unlink() Miklos Szeredi
2008-05-06 9:13 ` [patch 19/24] vfs: add path_symlink() Miklos Szeredi
2008-05-06 9:13 ` [patch 20/24] vfs: add path_link() Miklos Szeredi
2008-05-06 9:13 ` [patch 21/24] vfs: add path_rename() Miklos Szeredi
2008-05-06 9:13 ` [patch 22/24] vfs: add path_setattr() Miklos Szeredi
2008-05-06 9:13 ` [patch 23/24] vfs: add path_setxattr() Miklos Szeredi
2008-05-06 9:13 ` [patch 24/24] vfs: add path_removexattr() Miklos Szeredi
2008-05-06 9:16 ` [patch 00/24] vfs: fixes and cleanups + add helpers to check r/o bind mounts Christoph Hellwig
2008-05-06 10:33 ` Miklos Szeredi
2008-05-14 14:55 ` Pavel Machek
2008-05-07 11:57 ` Miklos Szeredi
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=20080506091432.483898418@szeredi.hu \
--to=miklos@szeredi.hu \
--cc=akpm@linux-foundation.org \
--cc=hch@infradead.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=viro@ZenIV.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;
as well as URLs for NNTP newsgroup(s).