mirrors/apparmor
1
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor.git synced 2025-03-04 08:24:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Still some params wrong way round.

Browse source
This commit is contained in:
Tony Jones 2007-01-23 10:37:51 +00:00
parent f2ef3cb398
commit 7e2f9c6c42
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
kernel-patches/for-mainline/security-link.diff
View file

@ -62,18 +62,18 @@ Index: linux-2.6.19/include/linux/security.h
}
static inline int security_inode_unlink (struct inode *dir,
@@ -2367,8 +2373,10 @@ static inline int security_inode_create
return 0;
@@ -2368,8 +2374,10 @@ static inline int security_inode_create
}
-static inline int security_inode_link (struct dentry *old_dentry,
+static inline int security_inode_link (struct vfsmount *old_mnt,
+ struct dentry *old_dentry,
static inline int security_inode_link (struct dentry *old_dentry,
+ struct vfsmount *old_mnt,
struct inode *dir,
+ struct vfsmount *new_mnt,
struct dentry *new_dentry)
- struct dentry *new_dentry)
+ struct dentry *new_dentry,
+ struct vfsmount *new_mnt)
{
return 0;
}
Index: linux-2.6.19/security/dummy.c
===================================================================
--- linux-2.6.19.orig/security/dummy.c

2
kernel-patches/for-mainline/vfs-notify_change.diff
View file

@ -114,7 +114,7 @@ Index: linux-2.6.19/fs/nfsd/vfs.c
if (!check_guard || guardtime == inode->i_ctime.tv_sec) {
fh_lock(fhp);
- host_err = notify_change(dentry, iap);
+ host_err = notify_change(NULL, dentry, iap);
+ host_err = notify_change(dentry, NULL, iap);
err = nfserrno(host_err);
fh_unlock(fhp);
}

4
kernel-patches/for-mainline/vfs-rmdir.diff
View file

@ -56,7 +56,7 @@ Index: linux-2.6.19/fs/nfsd/nfs4recover.c
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 = vfs_rmdir(dir->d_inode, NULL, dentry);
+ status = vfs_rmdir(dir->d_inode, dentry, NULL);
mutex_unlock(&dir->d_inode->i_mutex);
return status;
}
@ -69,7 +69,7 @@ Index: linux-2.6.19/fs/nfsd/vfs.c
host_err = vfs_unlink(dirp, rdentry);
} else { /* It's RMDIR */
- host_err = vfs_rmdir(dirp, rdentry);
+ host_err = vfs_rmdir(dirp, NULL, rdentry);
+ host_err = vfs_rmdir(dirp, rdentry, NULL);
}
dput(rdentry);