git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
security
/
inode.c
diff --git
a/security/inode.c
b/security/inode.c
index
0f77b02
..
9b16e14
100644
(file)
--- a/
security/inode.c
+++ b/
security/inode.c
@@
-13,7
+13,6
@@
*/
/* #define DEBUG */
*/
/* #define DEBUG */
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/fs.h>
#include <linux/mount.h>
#include <linux/module.h>
#include <linux/fs.h>
#include <linux/mount.h>
@@
-45,8
+44,8
@@
static ssize_t default_write_file(struct file *file, const char __user *buf,
static int default_open(struct inode *inode, struct file *file)
{
static int default_open(struct inode *inode, struct file *file)
{
- if (inode->
u.generic_ip
)
- file->private_data = inode->
u.generic_ip
;
+ if (inode->
i_private
)
+ file->private_data = inode->
i_private
;
return 0;
}
return 0;
}
@@
-65,7
+64,6
@@
static struct inode *get_inode(struct super_block *sb, int mode, dev_t dev)
inode->i_mode = mode;
inode->i_uid = 0;
inode->i_gid = 0;
inode->i_mode = mode;
inode->i_uid = 0;
inode->i_gid = 0;
- inode->i_blksize = PAGE_CACHE_SIZE;
inode->i_blocks = 0;
inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
switch (mode & S_IFMT) {
inode->i_blocks = 0;
inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
switch (mode & S_IFMT) {
@@
-80,7
+78,7
@@
static struct inode *get_inode(struct super_block *sb, int mode, dev_t dev)
inode->i_fop = &simple_dir_operations;
/* directory inodes start off with i_nlink == 2 (for "." entry) */
inode->i_fop = &simple_dir_operations;
/* directory inodes start off with i_nlink == 2 (for "." entry) */
- in
ode->i_nlink++
;
+ in
c_nlink(inode)
;
break;
}
}
break;
}
}
@@
-113,7
+111,7
@@
static int mkdir(struct inode *dir, struct dentry *dentry, int mode)
mode = (mode & (S_IRWXUGO | S_ISVTX)) | S_IFDIR;
res = mknod(dir, dentry, mode, 0);
if (!res)
mode = (mode & (S_IRWXUGO | S_ISVTX)) | S_IFDIR;
res = mknod(dir, dentry, mode, 0);
if (!res)
-
dir->i_nlink++
;
+
inc_nlink(dir)
;
return res;
}
return res;
}
@@
-135,11
+133,11
@@
static int fill_super(struct super_block *sb, void *data, int silent)
return simple_fill_super(sb, SECURITYFS_MAGIC, files);
}
return simple_fill_super(sb, SECURITYFS_MAGIC, files);
}
-static
struct super_block *
get_sb(struct file_system_type *fs_type,
-
int flags, const char *dev_name,
-
void *data
)
+static
int
get_sb(struct file_system_type *fs_type,
+ int flags, const char *dev_name,
+
void *data, struct vfsmount *mnt
)
{
{
- return get_sb_single(fs_type, flags, data, fill_super);
+ return get_sb_single(fs_type, flags, data, fill_super
, mnt
);
}
static struct file_system_type fs_type = {
}
static struct file_system_type fs_type = {
@@
-195,7
+193,7
@@
static int create_by_name(const char *name, mode_t mode,
* directory dentry if set. If this paramater is NULL, then the
* file will be created in the root of the securityfs filesystem.
* @data: a pointer to something that the caller will want to get to later
* directory dentry if set. If this paramater is NULL, then the
* file will be created in the root of the securityfs filesystem.
* @data: a pointer to something that the caller will want to get to later
- * on. The inode.
u.generic_ip
pointer will point to this value on
+ * on. The inode.
i_private
pointer will point to this value on
* the open() call.
* @fops: a pointer to a struct file_operations that should be used for
* this file.
* the open() call.
* @fops: a pointer to a struct file_operations that should be used for
* this file.
@@
-224,7
+222,7
@@
struct dentry *securityfs_create_file(const char *name, mode_t mode,
pr_debug("securityfs: creating file '%s'\n",name);
pr_debug("securityfs: creating file '%s'\n",name);
- error = simple_pin_fs(
"securityfs"
, &mount, &mount_count);
+ error = simple_pin_fs(
&fs_type
, &mount, &mount_count);
if (error) {
dentry = ERR_PTR(error);
goto exit;
if (error) {
dentry = ERR_PTR(error);
goto exit;
@@
-241,7
+239,7
@@
struct dentry *securityfs_create_file(const char *name, mode_t mode,
if (fops)
dentry->d_inode->i_fop = fops;
if (data)
if (fops)
dentry->d_inode->i_fop = fops;
if (data)
- dentry->d_inode->
u.generic_ip
= data;
+ dentry->d_inode->
i_private
= data;
}
exit:
return dentry;
}
exit:
return dentry;