mirror of
https://gitlab.com/apparmor/apparmor.git
synced 2025-03-05 17:01:00 +01:00
121 lines
4.7 KiB
Diff
121 lines
4.7 KiB
Diff
Add struct vfsmount parameters to vfs_rename()
|
|
|
|
Signed-off-by: Tony Jones <tonyj@suse.de>
|
|
Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
|
|
|
|
Index: b/fs/ecryptfs/inode.c
|
|
===================================================================
|
|
--- a/fs/ecryptfs/inode.c
|
|
+++ b/fs/ecryptfs/inode.c
|
|
@@ -601,19 +601,24 @@ ecryptfs_rename(struct inode *old_dir, s
|
|
{
|
|
int rc;
|
|
struct dentry *lower_old_dentry;
|
|
+ struct vfsmount *lower_old_mnt;
|
|
struct dentry *lower_new_dentry;
|
|
+ struct vfsmount *lower_new_mnt;
|
|
struct dentry *lower_old_dir_dentry;
|
|
struct dentry *lower_new_dir_dentry;
|
|
|
|
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_old_dir_dentry = dget_parent(lower_old_dentry);
|
|
lower_new_dir_dentry = dget_parent(lower_new_dentry);
|
|
lock_rename(lower_old_dir_dentry, lower_new_dir_dentry);
|
|
rc = vfs_rename(lower_old_dir_dentry->d_inode, lower_old_dentry,
|
|
- lower_new_dir_dentry->d_inode, lower_new_dentry);
|
|
+ lower_old_mnt, lower_new_dir_dentry->d_inode,
|
|
+ lower_new_dentry, lower_new_mnt);
|
|
if (rc)
|
|
goto out_lock;
|
|
fsstack_copy_attr_all(new_dir, lower_new_dir_dentry->d_inode, NULL);
|
|
Index: b/fs/namei.c
|
|
===================================================================
|
|
--- a/fs/namei.c
|
|
+++ b/fs/namei.c
|
|
@@ -2382,7 +2382,8 @@ asmlinkage long sys_link(const char __us
|
|
* locking].
|
|
*/
|
|
static int vfs_rename_dir(struct inode *old_dir, struct dentry *old_dentry,
|
|
- struct inode *new_dir, struct dentry *new_dentry)
|
|
+ struct vfsmount *old_mnt, struct inode *new_dir,
|
|
+ struct dentry *new_dentry, struct vfsmount *new_mnt)
|
|
{
|
|
int error = 0;
|
|
struct inode *target;
|
|
@@ -2425,7 +2426,8 @@ static int vfs_rename_dir(struct inode *
|
|
}
|
|
|
|
static int vfs_rename_other(struct inode *old_dir, struct dentry *old_dentry,
|
|
- struct inode *new_dir, struct dentry *new_dentry)
|
|
+ struct vfsmount *old_mnt, struct inode *new_dir,
|
|
+ struct dentry *new_dentry, struct vfsmount *new_mnt)
|
|
{
|
|
struct inode *target;
|
|
int error;
|
|
@@ -2453,7 +2455,8 @@ static int vfs_rename_other(struct inode
|
|
}
|
|
|
|
int vfs_rename(struct inode *old_dir, struct dentry *old_dentry,
|
|
- struct inode *new_dir, struct dentry *new_dentry)
|
|
+ struct vfsmount *old_mnt, struct inode *new_dir,
|
|
+ struct dentry *new_dentry, struct vfsmount *new_mnt)
|
|
{
|
|
int error;
|
|
int is_dir = S_ISDIR(old_dentry->d_inode->i_mode);
|
|
@@ -2482,9 +2485,11 @@ int vfs_rename(struct inode *old_dir, st
|
|
old_name = fsnotify_oldname_init(old_dentry->d_name.name);
|
|
|
|
if (is_dir)
|
|
- error = vfs_rename_dir(old_dir,old_dentry,new_dir,new_dentry);
|
|
+ error = vfs_rename_dir(old_dir, old_dentry, old_mnt,
|
|
+ new_dir, new_dentry, new_mnt);
|
|
else
|
|
- error = vfs_rename_other(old_dir,old_dentry,new_dir,new_dentry);
|
|
+ error = vfs_rename_other(old_dir, old_dentry, old_mnt,
|
|
+ new_dir, new_dentry, new_mnt);
|
|
if (!error) {
|
|
const char *new_name = old_dentry->d_name.name;
|
|
fsnotify_move(old_dir, new_dir, old_name, new_name, is_dir,
|
|
@@ -2556,8 +2561,8 @@ static int do_rename(int olddfd, const c
|
|
if (new_dentry == trap)
|
|
goto exit5;
|
|
|
|
- error = vfs_rename(old_dir->d_inode, old_dentry,
|
|
- new_dir->d_inode, new_dentry);
|
|
+ error = vfs_rename(old_dir->d_inode, old_dentry, oldnd.mnt,
|
|
+ new_dir->d_inode, new_dentry, newnd.mnt);
|
|
exit5:
|
|
dput(new_dentry);
|
|
exit4:
|
|
Index: b/fs/nfsd/vfs.c
|
|
===================================================================
|
|
--- a/fs/nfsd/vfs.c
|
|
+++ b/fs/nfsd/vfs.c
|
|
@@ -1625,7 +1625,8 @@ nfsd_rename(struct svc_rqst *rqstp, stru
|
|
host_err = -EPERM;
|
|
} else
|
|
#endif
|
|
- host_err = vfs_rename(fdir, odentry, tdir, ndentry);
|
|
+ host_err = vfs_rename(fdir, odentry, ffhp->fh_export->ex_mnt,
|
|
+ tdir, ndentry, tfhp->fh_export->ex_mnt);
|
|
if (!host_err && EX_ISSYNC(tfhp->fh_export)) {
|
|
host_err = nfsd_sync_dir(tdentry);
|
|
if (!host_err)
|
|
Index: b/include/linux/fs.h
|
|
===================================================================
|
|
--- a/include/linux/fs.h
|
|
+++ b/include/linux/fs.h
|
|
@@ -986,7 +986,7 @@ extern int vfs_symlink(struct inode *, s
|
|
extern int vfs_link(struct dentry *, struct vfsmount *, struct inode *, struct dentry *, struct vfsmount *);
|
|
extern int vfs_rmdir(struct inode *, struct dentry *, struct vfsmount *);
|
|
extern int vfs_unlink(struct inode *, struct dentry *, struct vfsmount *);
|
|
-extern int vfs_rename(struct inode *, struct dentry *, struct inode *, struct dentry *);
|
|
+extern int vfs_rename(struct inode *, struct dentry *, struct vfsmount *, struct inode *, struct dentry *, struct vfsmount *);
|
|
|
|
/*
|
|
* VFS dentry helper functions.
|