From: Miklos Szeredi <miklos@szeredi.hu>
To: viro@zeniv.linux.org.uk
Cc: akpm@linux-foundation.org, torvalds@linux-foundation.org,
dave@linux.vnet.ibm.com, ezk@cs.sunysb.edu, mhalcrow@us.ibm.com,
linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [patch 06/13] vfs: add path_rmdir()
Date: Thu, 24 Apr 2008 13:39:56 +0200 [thread overview]
Message-ID: <20080424114015.767330749@szeredi.hu> (raw)
In-Reply-To: <20080424113950.818688067@szeredi.hu>
[-- Attachment #1: path_rmdir.patch --]
[-- Type: text/plain, Size: 5245 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 | 20 ++++++++++++++------
fs/nfsd/nfs4recover.c | 3 ++-
fs/nfsd/vfs.c | 4 +++-
include/linux/fs.h | 1 +
5 files changed, 27 insertions(+), 14 deletions(-)
Index: vfs-2.6/fs/namei.c
===================================================================
--- vfs-2.6.orig/fs/namei.c 2008-04-23 20:04:28.000000000 +0200
+++ vfs-2.6/fs/namei.c 2008-04-23 20:04:42.000000000 +0200
@@ -2255,6 +2255,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;
@@ -2286,12 +2299,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);
Index: vfs-2.6/fs/ecryptfs/inode.c
===================================================================
--- vfs-2.6.orig/fs/ecryptfs/inode.c 2008-04-23 20:04:28.000000000 +0200
+++ vfs-2.6/fs/ecryptfs/inode.c 2008-04-23 20:04:42.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: vfs-2.6/fs/nfsd/nfs4recover.c
===================================================================
--- vfs-2.6.orig/fs/nfsd/nfs4recover.c 2008-04-23 20:04:28.000000000 +0200
+++ vfs-2.6/fs/nfsd/nfs4recover.c 2008-04-23 20:04:42.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: vfs-2.6/fs/nfsd/vfs.c
===================================================================
--- vfs-2.6.orig/fs/nfsd/vfs.c 2008-04-23 20:04:28.000000000 +0200
+++ vfs-2.6/fs/nfsd/vfs.c 2008-04-23 20:05:26.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: vfs-2.6/include/linux/fs.h
===================================================================
--- vfs-2.6.orig/include/linux/fs.h 2008-04-23 20:04:28.000000000 +0200
+++ vfs-2.6/include/linux/fs.h 2008-04-23 20:04:42.000000000 +0200
@@ -1130,6 +1130,7 @@ extern int path_mknod(struct path *, str
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-04-24 11:42 UTC|newest]
Thread overview: 63+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-04-24 11:39 [patch 00/13] vfs: add helpers to check r/o bind mounts Miklos Szeredi
2008-04-24 11:39 ` [patch 01/13] ecryptfs: add missing lock around notify_change Miklos Szeredi
2008-04-24 16:56 ` Erez Zadok
2008-04-24 17:09 ` Miklos Szeredi
2008-04-24 11:39 ` [patch 02/13] ecryptfs: clean up (un)lock_parent Miklos Szeredi
2008-04-24 11:39 ` [patch 03/13] nfsd: clean up mnt_want_write calls Miklos Szeredi
2008-04-24 11:39 ` [patch 04/13] vfs: add path_create() and path_mknod() Miklos Szeredi
2008-04-24 11:39 ` [patch 05/13] vfs: add path_mkdir() Miklos Szeredi
2008-04-24 11:39 ` Miklos Szeredi [this message]
2008-04-24 11:39 ` [patch 07/13] vfs: add path_unlink() Miklos Szeredi
2008-04-24 11:39 ` [patch 08/13] vfs: add path_symlink() Miklos Szeredi
2008-04-24 11:39 ` [patch 09/13] vfs: add path_link() Miklos Szeredi
2008-04-24 11:40 ` [patch 10/13] vfs: add path_rename() Miklos Szeredi
2008-04-24 11:40 ` [patch 11/13] vfs: add path_setattr() Miklos Szeredi
2008-04-24 11:40 ` [patch 12/13] vfs: add path_setxattr() Miklos Szeredi
2008-04-24 11:40 ` [patch 13/13] vfs: add path_removexattr() Miklos Szeredi
2008-04-24 12:42 ` [patch 00/13] vfs: add helpers to check r/o bind mounts Al Viro
2008-04-24 13:05 ` Miklos Szeredi
2008-04-24 13:48 ` Al Viro
2008-04-24 14:00 ` Al Viro
2008-04-24 14:16 ` Miklos Szeredi
2008-04-24 14:35 ` Al Viro
2008-04-24 14:42 ` Miklos Szeredi
2008-04-24 14:48 ` Al Viro
2008-04-24 14:58 ` Miklos Szeredi
2008-04-24 15:21 ` Al Viro
2008-04-24 15:37 ` Miklos Szeredi
2008-04-24 15:59 ` Al Viro
2008-04-24 16:16 ` Miklos Szeredi
2008-04-28 10:15 ` Miklos Szeredi
2008-04-28 14:20 ` Michael Halcrow
2008-04-28 14:52 ` Miklos Szeredi
2008-04-25 7:22 ` Miklos Szeredi
2008-04-24 17:55 ` Dave Hansen
2008-04-24 18:47 ` Miklos Szeredi
2008-04-24 14:09 ` Miklos Szeredi
2008-04-24 14:28 ` Al Viro
2008-04-24 14:36 ` Miklos Szeredi
2008-04-24 14:44 ` Al Viro
2008-04-24 14:53 ` Miklos Szeredi
2008-04-24 15:12 ` Al Viro
2008-04-24 15:18 ` Miklos Szeredi
2008-04-24 15:38 ` Al Viro
2008-04-24 15:43 ` Miklos Szeredi
2008-04-24 17:29 ` Erez Zadok
2008-04-24 18:13 ` Al Viro
2008-04-24 19:40 ` Erez Zadok
2008-04-24 20:16 ` Michael Halcrow
2008-04-24 22:39 ` Erez Zadok
2008-04-24 23:33 ` Michael Halcrow
2008-04-28 21:53 ` J. Bruce Fields
2008-04-24 17:25 ` Erez Zadok
2008-04-24 17:30 ` Al Viro
2008-04-24 19:56 ` Erez Zadok
2008-04-24 17:04 ` Erez Zadok
2008-04-24 16:52 ` Erez Zadok
2008-04-24 16:58 ` Miklos Szeredi
2008-04-24 17:14 ` Erez Zadok
2008-04-24 17:23 ` Miklos Szeredi
2008-05-01 5:40 ` Dave Hansen
2008-05-01 8:08 ` Miklos Szeredi
2008-05-01 16:40 ` Dave Hansen
2008-05-01 17:04 ` 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=20080424114015.767330749@szeredi.hu \
--to=miklos@szeredi.hu \
--cc=akpm@linux-foundation.org \
--cc=dave@linux.vnet.ibm.com \
--cc=ezk@cs.sunysb.edu \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mhalcrow@us.ibm.com \
--cc=torvalds@linux-foundation.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
all inboxes | Powered by JetHome®