mirror of
https://gitlab.com/apparmor/apparmor
synced 2025-09-05 16:55:32 +00:00
84 lines
3.5 KiB
Diff
84 lines
3.5 KiB
Diff
|
Add struct vfsmount parameters to vfs_link()
|
||
|
|
|
||
|
|
Signed-off-by: Tony Jones <tonyj@suse.de>
|
||
|
|
Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
|
||
|
|
|
||
|
|
Index: linux-2.6.19/fs/namei.c
|
||
|
|
===================================================================
|
||
|
|
--- linux-2.6.19.orig/fs/namei.c
|
||
|
|
+++ linux-2.6.19/fs/namei.c
|
||
|
|
@@ -2254,7 +2254,7 @@ asmlinkage long sys_symlink(const char _
|
||
|
|
return sys_symlinkat(oldname, AT_FDCWD, newname);
|
||
|
|
}
|
||
|
|
|
||
|
|
-int vfs_link(struct dentry *old_dentry, struct inode *dir, struct dentry *new_dentry)
|
||
|
|
+int vfs_link(struct vfsmount *old_mnt, struct dentry *old_dentry, struct inode *dir, struct vfsmount *new_mnt, struct dentry *new_dentry)
|
||
|
|
{
|
||
|
|
struct inode *inode = old_dentry->d_inode;
|
||
|
|
int error;
|
||
|
|
@@ -2332,7 +2332,8 @@ asmlinkage long sys_linkat(int olddfd, c
|
||
|
|
error = PTR_ERR(new_dentry);
|
||
|
|
if (IS_ERR(new_dentry))
|
||
|
|
goto out_unlock;
|
||
|
|
- error = vfs_link(old_nd.dentry, nd.dentry->d_inode, new_dentry);
|
||
|
|
+ error = vfs_link(old_nd.mnt, old_nd.dentry, nd.dentry->d_inode, nd.mnt,
|
||
|
|
+ new_dentry);
|
||
|
|
dput(new_dentry);
|
||
|
|
out_unlock:
|
||
|
|
mutex_unlock(&nd.dentry->d_inode->i_mutex);
|
||
|
|
Index: linux-2.6.19/include/linux/fs.h
|
||
|
|
===================================================================
|
||
|
|
--- linux-2.6.19.orig/include/linux/fs.h
|
||
|
|
+++ linux-2.6.19/include/linux/fs.h
|
||
|
|
@@ -1016,7 +1016,7 @@ extern int vfs_create(struct inode *, st
|
||
|
|
extern int vfs_mkdir(struct inode *, struct vfsmount *, struct dentry *, int);
|
||
|
|
extern int vfs_mknod(struct inode *, struct vfsmount *, struct dentry *, int, dev_t);
|
||
|
|
extern int vfs_symlink(struct inode *, struct vfsmount *, struct dentry *, const char *, int);
|
||
|
|
-extern int vfs_link(struct dentry *, struct inode *, struct dentry *);
|
||
|
|
+extern int vfs_link(struct vfsmount *, struct dentry *, struct inode *, struct vfsmount *, struct dentry *);
|
||
|
|
extern int vfs_rmdir(struct inode *, struct dentry *);
|
||
|
|
extern int vfs_unlink(struct inode *, struct dentry *);
|
||
|
|
extern int vfs_rename(struct inode *, struct dentry *, struct inode *, struct dentry *);
|
||
|
|
Index: linux-2.6.19/fs/ecryptfs/inode.c
|
||
|
|
===================================================================
|
||
|
|
--- linux-2.6.19.orig/fs/ecryptfs/inode.c
|
||
|
|
+++ linux-2.6.19/fs/ecryptfs/inode.c
|
||
|
|
@@ -444,18 +444,23 @@ static int ecryptfs_link(struct dentry *
|
||
|
|
struct dentry *new_dentry)
|
||
|
|
{
|
||
|
|
struct dentry *lower_old_dentry;
|
||
|
|
+ struct vfsmount *lower_old_mnt;
|
||
|
|
struct dentry *lower_new_dentry;
|
||
|
|
+ struct vfsmount *lower_new_mnt;
|
||
|
|
struct dentry *lower_dir_dentry;
|
||
|
|
u64 file_size_save;
|
||
|
|
int rc;
|
||
|
|
|
||
|
|
file_size_save = i_size_read(old_dentry->d_inode);
|
||
|
|
lower_old_dentry = ecryptfs_dentry_to_lower(old_dentry);
|
||
|
|
+ lower_old_mnt = ecryptfs_dentry_to_lower_mnt(old_dentry);
|
||
|
|
lower_new_dentry = ecryptfs_dentry_to_lower(new_dentry);
|
||
|
|
+ lower_new_mnt = ecryptfs_dentry_to_lower_mnt(new_dentry);
|
||
|
|
dget(lower_old_dentry);
|
||
|
|
dget(lower_new_dentry);
|
||
|
|
lower_dir_dentry = lock_parent(lower_new_dentry);
|
||
|
|
- rc = vfs_link(lower_old_dentry, lower_dir_dentry->d_inode,
|
||
|
|
+ rc = vfs_link(lower_old_mnt, lower_old_dentry,
|
||
|
|
+ lower_dir_dentry->d_inode, lower_new_mnt,
|
||
|
|
lower_new_dentry);
|
||
|
|
if (rc || !lower_new_dentry->d_inode)
|
||
|
|
goto out_lock;
|
||
|
|
Index: linux-2.6.19/fs/nfsd/vfs.c
|
||
|
|
===================================================================
|
||
|
|
--- linux-2.6.19.orig/fs/nfsd/vfs.c
|
||
|
|
+++ linux-2.6.19/fs/nfsd/vfs.c
|
||
|
|
@@ -1538,7 +1538,7 @@ nfsd_link(struct svc_rqst *rqstp, struct
|
||
|
|
dold = tfhp->fh_dentry;
|
||
|
|
dest = dold->d_inode;
|
||
|
|
|
||
|
|
- host_err = vfs_link(dold, dirp, dnew);
|
||
|
|
+ host_err = vfs_link(NULL, dold, dirp, NULL, dnew);
|
||
|
|
if (!host_err) {
|
||
|
|
if (EX_ISSYNC(ffhp->fh_export)) {
|
||
|
|
err = nfserrno(nfsd_sync_dir(ddir));
|