diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-06 03:04:32 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-06 03:04:32 -0500 |
| commit | d12418fdeafdc08dd5bbec89d3e07e47ee75da55 (patch) | |
| tree | ac94d5bf58360b89fc7439fb52182c17d0674b0a /security/inode.c | |
| parent | c2d1cec1c77f7714672c1efeae075424c929e0d5 (diff) | |
| parent | 238c6d54830c624f34ac9cf123ac04aebfca5013 (diff) | |
Merge branch 'linus' into cpus4096
Diffstat (limited to 'security/inode.c')
| -rw-r--r-- | security/inode.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/security/inode.c b/security/inode.c index efea5a605466..007ef252dde7 100644 --- a/security/inode.c +++ b/security/inode.c | |||
| @@ -61,9 +61,6 @@ static struct inode *get_inode(struct super_block *sb, int mode, dev_t dev) | |||
| 61 | 61 | ||
| 62 | if (inode) { | 62 | if (inode) { |
| 63 | inode->i_mode = mode; | 63 | inode->i_mode = mode; |
| 64 | inode->i_uid = 0; | ||
| 65 | inode->i_gid = 0; | ||
| 66 | inode->i_blocks = 0; | ||
| 67 | inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME; | 64 | inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME; |
| 68 | switch (mode & S_IFMT) { | 65 | switch (mode & S_IFMT) { |
| 69 | default: | 66 | default: |