git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
OMAP3: DMA: Enable idlemodes for DMA OCP
[safe/jmp/linux-2.6]
/
security
/
inode.c
diff --git
a/security/inode.c
b/security/inode.c
index
b41e708
..
f7496c6
100644
(file)
--- 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)
if (inode) {
inode->i_mode = mode;
if (inode) {
inode->i_mode = mode;
- inode->i_uid = 0;
- inode->i_gid = 0;
- inode->i_blocks = 0;
inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
switch (mode & S_IFMT) {
default:
inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
switch (mode & S_IFMT) {
default:
@@
-290,7
+287,7
@@
void securityfs_remove(struct dentry *dentry)
{
struct dentry *parent;
{
struct dentry *parent;
- if (!dentry)
+ if (!dentry
|| IS_ERR(dentry)
)
return;
parent = dentry->d_parent;
return;
parent = dentry->d_parent;