From: Miklos Szeredi <mszeredi@xxxxxxx>
Introduce path_unlink(). Make vfs_unlink() static.
Signed-off-by: Miklos Szeredi <mszeredi@xxxxxxx>
---
fs/ecryptfs/inode.c | 17 ++++++-----------
fs/namei.c | 22 +++++++++++++++-------
fs/nfsd/nfs4recover.c | 3 ++-
fs/nfsd/vfs.c | 4 +---
include/linux/fs.h | 2 +-
ipc/mqueue.c | 10 +++++-----
6 files changed, 30 insertions(+), 28 deletions(-)
Index: vfs-2.6/fs/ecryptfs/inode.c
===================================================================
--- vfs-2.6.orig/fs/ecryptfs/inode.c 2008-04-02 21:13:30.000000000 +0200
+++ vfs-2.6/fs/ecryptfs/inode.c 2008-04-02 21:35:07.000000000 +0200
@@ -42,12 +42,6 @@ static struct dentry *lock_parent(struct
return dir;
}
-static void unlock_parent(struct dentry *dentry)
-{
- mutex_unlock(&(dentry->d_parent->d_inode->i_mutex));
- dput(dentry->d_parent);
-}
-
static void unlock_dir(struct dentry *dir)
{
mutex_unlock(&dir->d_inode->i_mutex);
@@ -425,21 +419,22 @@ static int ecryptfs_unlink(struct inode
{
int rc = 0;
struct dentry *lower_dentry = ecryptfs_dentry_to_lower(dentry);
- struct inode *lower_dir_inode = ecryptfs_inode_to_lower(dir);
+ struct path lower_dir;
- lock_parent(lower_dentry);
- rc = vfs_unlink(lower_dir_inode, lower_dentry);
+ lower_dir.mnt = ecryptfs_dentry_to_lower_mnt(dentry);
+ lower_dir.dentry = lock_parent(lower_dentry);
+ rc = path_unlink(&lower_dir, lower_dentry);
if (rc) {
printk(KERN_ERR "Error in vfs_unlink; rc = [%d]\n", rc);
goto out_unlock;
}
- fsstack_copy_attr_times(dir, lower_dir_inode);
+ fsstack_copy_attr_times(dir, lower_dir.dentry->d_inode);
dentry->d_inode->i_nlink =
ecryptfs_inode_to_lower(dentry->d_inode)->i_nlink;
dentry->d_inode->i_ctime = dir->i_ctime;
d_drop(dentry);
out_unlock:
- unlock_parent(lower_dentry);
+ unlock_dir(lower_dir.dentry);
return rc;
}
Index: vfs-2.6/fs/namei.c
===================================================================
--- vfs-2.6.orig/fs/namei.c 2008-04-02 21:13:30.000000000 +0200
+++ vfs-2.6/fs/namei.c 2008-04-02 21:35:07.000000000 +0200
@@ -2315,7 +2315,7 @@ asmlinkage long sys_rmdir(const char __u
return do_rmdir(AT_FDCWD, pathname);
}
-int vfs_unlink(struct inode *dir, struct dentry *dentry)
+static int vfs_unlink(struct inode *dir, struct dentry *dentry)
{
int error = may_delete(dir, dentry, 0);
@@ -2346,6 +2346,19 @@ int vfs_unlink(struct inode *dir, struct
return error;
}
+int path_unlink(struct path *dir_path, struct dentry *dentry)
+{
+ int error = mnt_want_write(dir_path->mnt);
+
+ if (!error) {
+ error = vfs_unlink(dir_path->dentry->d_inode, dentry);
+ mnt_drop_write(dir_path->mnt);
+ }
+
+ return error;
+}
+EXPORT_SYMBOL(path_unlink);
+
/*
* Make sure that the actual truncation of the file will occur outside its
* directory's i_mutex. Truncate can take a long time if there is a lot of
@@ -2380,11 +2393,7 @@ static long do_unlinkat(int dfd, const c
inode = dentry->d_inode;
if (inode)
atomic_inc(&inode->i_count);
- error = mnt_want_write(nd.path.mnt);
- if (error)
- goto exit2;
- error = vfs_unlink(nd.path.dentry->d_inode, dentry);
- mnt_drop_write(nd.path.mnt);
+ error = path_unlink(&nd.path, dentry);
exit2:
dput(dentry);
}
@@ -2996,6 +3005,5 @@ EXPORT_SYMBOL(vfs_readlink);
EXPORT_SYMBOL(vfs_rename);
EXPORT_SYMBOL(vfs_rmdir);
EXPORT_SYMBOL(vfs_symlink);
-EXPORT_SYMBOL(vfs_unlink);
EXPORT_SYMBOL(dentry_unhash);
EXPORT_SYMBOL(generic_readlink);
Index: vfs-2.6/fs/nfsd/nfs4recover.c
===================================================================
--- vfs-2.6.orig/fs/nfsd/nfs4recover.c 2008-04-02 21:13:30.000000000 +0200
+++ vfs-2.6/fs/nfsd/nfs4recover.c 2008-04-02 21:15:25.000000000 +0200
@@ -252,6 +252,7 @@ out:
static int
nfsd4_remove_clid_file(struct dentry *dir, struct dentry *dentry)
{
+ struct path dir_path = { .dentry = dir, .mnt = rec_dir.path.mnt };
int status;
if (!S_ISREG(dir->d_inode->i_mode)) {
@@ -259,7 +260,7 @@ nfsd4_remove_clid_file(struct dentry *di
return -EINVAL;
}
mutex_lock_nested(&dir->d_inode->i_mutex, I_MUTEX_PARENT);
- status = vfs_unlink(dir->d_inode, dentry);
+ status = path_unlink(&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-02 21:13:30.000000000 +0200
+++ vfs-2.6/fs/nfsd/vfs.c 2008-04-02 21:35:07.000000000 +0200
@@ -1734,7 +1734,6 @@ nfsd_unlink(struct svc_rqst *rqstp, stru
{
struct path dir_path;
struct dentry *dentry, *rdentry;
- struct inode *dirp;
__be32 err;
int host_err;
@@ -1747,7 +1746,6 @@ nfsd_unlink(struct svc_rqst *rqstp, stru
fh_lock_nested(fhp, I_MUTEX_PARENT);
dentry = fhp->fh_dentry;
- dirp = dentry->d_inode;
rdentry = lookup_one_len(fname, dentry, flen);
host_err = PTR_ERR(rdentry);
@@ -1772,7 +1770,7 @@ nfsd_unlink(struct svc_rqst *rqstp, stru
host_err = -EPERM;
} else
#endif
- host_err = vfs_unlink(dirp, rdentry);
+ host_err = path_unlink(&dir_path, rdentry);
} else { /* It's RMDIR */
host_err = path_rmdir(&dir_path, rdentry);
}
Index: vfs-2.6/include/linux/fs.h
===================================================================
--- vfs-2.6.orig/include/linux/fs.h 2008-04-02 21:13:30.000000000 +0200
+++ vfs-2.6/include/linux/fs.h 2008-04-02 21:35:07.000000000 +0200
@@ -1131,7 +1131,7 @@ extern int vfs_symlink(struct inode *, s
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 path_unlink(struct path *, struct dentry *);
extern int vfs_rename(struct inode *, struct dentry *, struct inode *, struct dentry *);
/*
Index: vfs-2.6/ipc/mqueue.c
===================================================================
--- vfs-2.6.orig/ipc/mqueue.c 2008-04-02 21:10:17.000000000 +0200
+++ vfs-2.6/ipc/mqueue.c 2008-04-02 21:15:25.000000000 +0200
@@ -737,6 +737,7 @@ asmlinkage long sys_mq_unlink(const char
char *name;
struct dentry *dentry;
struct inode *inode = NULL;
+ struct path dir_path;
name = getname(u_name);
if (IS_ERR(name))
@@ -758,11 +759,10 @@ asmlinkage long sys_mq_unlink(const char
inode = dentry->d_inode;
if (inode)
atomic_inc(&inode->i_count);
- err = mnt_want_write(mqueue_mnt);
- if (err)
- goto out_err;
- err = vfs_unlink(dentry->d_parent->d_inode, dentry);
- mnt_drop_write(mqueue_mnt);
+
+ dir_path.mnt = mqueue_mnt;
+ dir_path.dentry = dentry->d_parent;
+ err = path_unlink(&dir_path, dentry);
out_err:
dput(dentry);
--
--
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
