From: Miklos Szeredi <miklos@szeredi.hu>
To: akpm@linux-foundation.org
Cc: hch@infradead.org, viro@zeniv.linux.org.uk,
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 05/10] vfs: add path_symlink()
Date: Mon, 05 May 2008 12:16:26 +0200 [thread overview]
Message-ID: <20080505101646.297248976@szeredi.hu> (raw)
In-Reply-To: <20080505101621.216789969@szeredi.hu>
[-- Attachment #1: path_symlink.patch --]
[-- Type: text/plain, Size: 6302 bytes --]
From: Miklos Szeredi <mszeredi@suse.cz>
Introduce path_symlink(). Make vfs_symlink() static.
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
---
fs/ecryptfs/inode.c | 14 +++++++-------
fs/namei.c | 26 ++++++++++++++++++--------
fs/nfsd/vfs.c | 12 ++++--------
include/linux/fs.h | 2 +-
4 files changed, 30 insertions(+), 24 deletions(-)
Index: linux-2.6/fs/ecryptfs/inode.c
===================================================================
--- linux-2.6.orig/fs/ecryptfs/inode.c 2008-05-05 11:29:31.000000000 +0200
+++ linux-2.6/fs/ecryptfs/inode.c 2008-05-05 11:29:31.000000000 +0200
@@ -439,7 +439,7 @@ static int ecryptfs_symlink(struct inode
{
int rc;
struct dentry *lower_dentry;
- struct dentry *lower_dir_dentry;
+ struct path lower_dir;
umode_t mode;
char *encoded_symname;
int encoded_symlen;
@@ -447,7 +447,8 @@ static int ecryptfs_symlink(struct inode
lower_dentry = ecryptfs_dentry_to_lower(dentry);
dget(lower_dentry);
- lower_dir_dentry = lock_parent(lower_dentry);
+ lower_dir.mnt = ecryptfs_dentry_to_lower_mnt(dentry);
+ lower_dir.dentry = lock_parent(lower_dentry);
mode = S_IALLUGO;
encoded_symlen = ecryptfs_encode_filename(crypt_stat, symname,
strlen(symname),
@@ -456,18 +457,17 @@ static int ecryptfs_symlink(struct inode
rc = encoded_symlen;
goto out_lock;
}
- rc = vfs_symlink(lower_dir_dentry->d_inode, lower_dentry,
- encoded_symname, mode);
+ rc = path_symlink(&lower_dir, lower_dentry, encoded_symname, mode);
kfree(encoded_symname);
if (rc || !lower_dentry->d_inode)
goto out_lock;
rc = ecryptfs_interpose(lower_dentry, dentry, dir->i_sb, 0);
if (rc)
goto out_lock;
- fsstack_copy_attr_times(dir, lower_dir_dentry->d_inode);
- fsstack_copy_inode_size(dir, lower_dir_dentry->d_inode);
+ fsstack_copy_attr_times(dir, lower_dir.dentry->d_inode);
+ fsstack_copy_inode_size(dir, lower_dir.dentry->d_inode);
out_lock:
- unlock_dir(lower_dir_dentry);
+ unlock_dir(lower_dir.dentry);
dput(lower_dentry);
if (!dentry->d_inode)
d_drop(dentry);
Index: linux-2.6/fs/namei.c
===================================================================
--- linux-2.6.orig/fs/namei.c 2008-05-05 11:29:31.000000000 +0200
+++ linux-2.6/fs/namei.c 2008-05-05 11:29:31.000000000 +0200
@@ -2434,7 +2434,7 @@ asmlinkage long sys_unlink(const char __
return do_unlinkat(AT_FDCWD, pathname);
}
-int vfs_symlink(struct inode *dir, struct dentry *dentry, const char *oldname, int mode)
+static int vfs_symlink(struct inode *dir, struct dentry *dentry, const char *oldname, int mode)
{
int error = may_create(dir, dentry, NULL);
@@ -2455,6 +2455,22 @@ int vfs_symlink(struct inode *dir, struc
return error;
}
+int path_symlink(struct path *dir_path, struct dentry *dentry,
+ const char *oldname, int mode)
+{
+ int error = mnt_want_write(dir_path->mnt);
+
+ if (!error) {
+ struct inode *dir = dir_path->dentry->d_inode;
+
+ error = vfs_symlink(dir, dentry, oldname, mode);
+ mnt_drop_write(dir_path->mnt);
+ }
+
+ return error;
+}
+EXPORT_SYMBOL(path_symlink);
+
asmlinkage long sys_symlinkat(const char __user *oldname,
int newdfd, const char __user *newname)
{
@@ -2480,12 +2496,7 @@ asmlinkage long sys_symlinkat(const char
if (IS_ERR(dentry))
goto out_unlock;
- error = mnt_want_write(nd.path.mnt);
- if (error)
- goto out_dput;
- error = vfs_symlink(nd.path.dentry->d_inode, dentry, from, S_IALLUGO);
- mnt_drop_write(nd.path.mnt);
-out_dput:
+ error = path_symlink(&nd.path, dentry, from, S_IALLUGO);
dput(dentry);
out_unlock:
mutex_unlock(&nd.path.dentry->d_inode->i_mutex);
@@ -3009,6 +3020,5 @@ EXPORT_SYMBOL(vfs_link);
EXPORT_SYMBOL(generic_permission);
EXPORT_SYMBOL(vfs_readlink);
EXPORT_SYMBOL(vfs_rename);
-EXPORT_SYMBOL(vfs_symlink);
EXPORT_SYMBOL(dentry_unhash);
EXPORT_SYMBOL(generic_readlink);
Index: linux-2.6/fs/nfsd/vfs.c
===================================================================
--- linux-2.6.orig/fs/nfsd/vfs.c 2008-05-05 11:29:31.000000000 +0200
+++ linux-2.6/fs/nfsd/vfs.c 2008-05-05 11:29:31.000000000 +0200
@@ -1518,6 +1518,7 @@ nfsd_symlink(struct svc_rqst *rqstp, str
struct svc_fh *resfhp,
struct iattr *iap)
{
+ struct path dir_path;
struct dentry *dentry, *dnew;
__be32 err, cerr;
int host_err;
@@ -1545,10 +1546,7 @@ nfsd_symlink(struct svc_rqst *rqstp, str
if (iap && (iap->ia_valid & ATTR_MODE))
mode = iap->ia_mode & S_IALLUGO;
- host_err = mnt_want_write(fhp->fh_export->ex_path.mnt);
- if (host_err)
- goto out_nfserr;
-
+ fh_to_path(fhp, &dir_path);
if (unlikely(path[plen] != 0)) {
char *path_alloced = kmalloc(plen+1, GFP_KERNEL);
if (path_alloced == NULL)
@@ -1556,11 +1554,11 @@ nfsd_symlink(struct svc_rqst *rqstp, str
else {
strncpy(path_alloced, path, plen);
path_alloced[plen] = 0;
- host_err = vfs_symlink(dentry->d_inode, dnew, path_alloced, mode);
+ host_err = path_symlink(&dir_path, dnew, path_alloced, mode);
kfree(path_alloced);
}
} else
- host_err = vfs_symlink(dentry->d_inode, dnew, path, mode);
+ host_err = path_symlink(&dir_path, dnew, path, mode);
if (!host_err) {
if (EX_ISSYNC(fhp->fh_export))
@@ -1569,8 +1567,6 @@ nfsd_symlink(struct svc_rqst *rqstp, str
err = nfserrno(host_err);
fh_unlock(fhp);
- mnt_drop_write(fhp->fh_export->ex_path.mnt);
-
cerr = fh_compose(resfhp, fhp->fh_export, dnew, fhp);
dput(dnew);
if (err==0) err = cerr;
Index: linux-2.6/include/linux/fs.h
===================================================================
--- linux-2.6.orig/include/linux/fs.h 2008-05-05 11:29:31.000000000 +0200
+++ linux-2.6/include/linux/fs.h 2008-05-05 11:29:31.000000000 +0200
@@ -1127,7 +1127,7 @@ extern int vfs_permission(struct nameida
extern int path_create(struct path *, struct dentry *, int, struct nameidata *);
extern int path_mkdir(struct path *, struct dentry *, int);
extern int path_mknod(struct path *, struct dentry *, int, dev_t);
-extern int vfs_symlink(struct inode *, struct dentry *, const char *, int);
+extern int path_symlink(struct path *, struct dentry *, const char *, int);
extern int vfs_link(struct dentry *, struct inode *, struct dentry *);
extern int path_rmdir(struct path *, struct dentry *);
extern int path_unlink(struct path *, struct dentry *);
--
next prev parent reply other threads:[~2008-05-05 10:19 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-05-05 10:16 [patch 00/10] vfs: add helpers to check r/o bind mounts v3 Miklos Szeredi
2008-05-05 10:16 ` [patch 01/10] vfs: add path_create() and path_mknod() Miklos Szeredi
2008-05-06 4:12 ` Andrew Morton
2008-05-06 4:24 ` Al Viro
2008-05-06 5:46 ` Andrew Morton
2008-05-06 6:24 ` Miklos Szeredi
2008-05-05 10:16 ` [patch 02/10] vfs: add path_mkdir() Miklos Szeredi
2008-05-05 10:16 ` [patch 03/10] vfs: add path_rmdir() Miklos Szeredi
2008-05-05 10:16 ` [patch 04/10] vfs: add path_unlink() Miklos Szeredi
2008-05-05 10:16 ` Miklos Szeredi [this message]
2008-05-05 10:16 ` [patch 06/10] vfs: add path_link() Miklos Szeredi
2008-05-05 10:16 ` [patch 07/10] vfs: add path_rename() Miklos Szeredi
2008-05-05 10:16 ` [patch 08/10] vfs: add path_setattr() Miklos Szeredi
2008-05-05 10:16 ` [patch 09/10] vfs: add path_setxattr() Miklos Szeredi
2008-05-05 10:16 ` [patch 10/10] vfs: add path_removexattr() Miklos Szeredi
-- strict thread matches above, loose matches on Subject: below --
2008-04-02 20:12 [patch 00/10] vfs: add helpers to check r/o bind mounts Miklos Szeredi
2008-04-02 20:12 ` [patch 05/10] vfs: add path_symlink() 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=20080505101646.297248976@szeredi.hu \
--to=miklos@szeredi.hu \
--cc=akpm@linux-foundation.org \
--cc=dave@linux.vnet.ibm.com \
--cc=ezk@cs.sunysb.edu \
--cc=hch@infradead.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mhalcrow@us.ibm.com \
--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®