diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2008-12-09 09:34:39 -0500 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2009-01-05 11:54:28 -0500 |
| commit | 56ff5efad96182f4d3cb3dc6b07396762c658f16 (patch) | |
| tree | cb91f93aa2324573527165d56d230b606a3111ed | |
| parent | acfa4380efe77e290d3a96b11cd4c9f24f4fbb18 (diff) | |
zero i_uid/i_gid on inode allocation
... and don't bother in callers. Don't bother with zeroing i_blocks,
while we are at it - it's already been zeroed.
i_mode is not worth the effort; it has no common default value.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
31 files changed, 2 insertions, 66 deletions
diff --git a/arch/powerpc/platforms/cell/spufs/inode.c b/arch/powerpc/platforms/cell/spufs/inode.c index 6296bfd9cb0b..e309ef70a531 100644 --- a/arch/powerpc/platforms/cell/spufs/inode.c +++ b/arch/powerpc/platforms/cell/spufs/inode.c | |||
| @@ -97,7 +97,6 @@ spufs_new_inode(struct super_block *sb, int mode) | |||
| 97 | inode->i_mode = mode; | 97 | inode->i_mode = mode; |
| 98 | inode->i_uid = current_fsuid(); | 98 | inode->i_uid = current_fsuid(); |
| 99 | inode->i_gid = current_fsgid(); | 99 | inode->i_gid = current_fsgid(); |
| 100 | inode->i_blocks = 0; | ||
| 101 | inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME; | 100 | inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME; |
| 102 | out: | 101 | out: |
| 103 | return inode; | 102 | return inode; |
diff --git a/arch/s390/hypfs/inode.c b/arch/s390/hypfs/inode.c index 9d4f8e6c0800..5a805df216bb 100644 --- a/arch/s390/hypfs/inode.c +++ b/arch/s390/hypfs/inode.c | |||
| @@ -106,7 +106,6 @@ static struct inode *hypfs_make_inode(struct super_block *sb, int mode) | |||
| 106 | ret->i_mode = mode; | 106 | ret->i_mode = mode; |
| 107 | ret->i_uid = hypfs_info->uid; | 107 | ret->i_uid = hypfs_info->uid; |
| 108 | ret->i_gid = hypfs_info->gid; | 108 | ret->i_gid = hypfs_info->gid; |
| 109 | ret->i_blocks = 0; | ||
| 110 | ret->i_atime = ret->i_mtime = ret->i_ctime = CURRENT_TIME; | 109 | ret->i_atime = ret->i_mtime = ret->i_ctime = CURRENT_TIME; |
| 111 | if (mode & S_IFDIR) | 110 | if (mode & S_IFDIR) |
| 112 | ret->i_nlink = 2; | 111 | ret->i_nlink = 2; |
diff --git a/drivers/infiniband/hw/ipath/ipath_fs.c b/drivers/infiniband/hw/ipath/ipath_fs.c index 53912c327bfe..8dc2bb781605 100644 --- a/drivers/infiniband/hw/ipath/ipath_fs.c +++ b/drivers/infiniband/hw/ipath/ipath_fs.c | |||
| @@ -57,9 +57,6 @@ static int ipathfs_mknod(struct inode *dir, struct dentry *dentry, | |||
| 57 | } | 57 | } |
| 58 | 58 | ||
| 59 | inode->i_mode = mode; | 59 | inode->i_mode = mode; |
| 60 | inode->i_uid = 0; | ||
| 61 | inode->i_gid = 0; | ||
| 62 | inode->i_blocks = 0; | ||
| 63 | inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME; | 60 | inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME; |
| 64 | inode->i_private = data; | 61 | inode->i_private = data; |
| 65 | if ((mode & S_IFMT) == S_IFDIR) { | 62 | if ((mode & S_IFMT) == S_IFDIR) { |
diff --git a/drivers/isdn/capi/capifs.c b/drivers/isdn/capi/capifs.c index 0aa66ec4cbdd..b129409925af 100644 --- a/drivers/isdn/capi/capifs.c +++ b/drivers/isdn/capi/capifs.c | |||
| @@ -111,8 +111,6 @@ capifs_fill_super(struct super_block *s, void *data, int silent) | |||
| 111 | goto fail; | 111 | goto fail; |
| 112 | inode->i_ino = 1; | 112 | inode->i_ino = 1; |
| 113 | inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME; | 113 | inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME; |
| 114 | inode->i_blocks = 0; | ||
| 115 | inode->i_uid = inode->i_gid = 0; | ||
| 116 | inode->i_mode = S_IFDIR | S_IRUGO | S_IXUGO | S_IWUSR; | 114 | inode->i_mode = S_IFDIR | S_IRUGO | S_IXUGO | S_IWUSR; |
| 117 | inode->i_op = &simple_dir_inode_operations; | 115 | inode->i_op = &simple_dir_inode_operations; |
| 118 | inode->i_fop = &simple_dir_operations; | 116 | inode->i_fop = &simple_dir_operations; |
diff --git a/drivers/misc/ibmasm/ibmasmfs.c b/drivers/misc/ibmasm/ibmasmfs.c index 22a7e8ba211d..de966a6fb7e6 100644 --- a/drivers/misc/ibmasm/ibmasmfs.c +++ b/drivers/misc/ibmasm/ibmasmfs.c | |||
| @@ -146,8 +146,6 @@ static struct inode *ibmasmfs_make_inode(struct super_block *sb, int mode) | |||
| 146 | 146 | ||
| 147 | if (ret) { | 147 | if (ret) { |
| 148 | ret->i_mode = mode; | 148 | ret->i_mode = mode; |
| 149 | ret->i_uid = ret->i_gid = 0; | ||
| 150 | ret->i_blocks = 0; | ||
| 151 | ret->i_atime = ret->i_mtime = ret->i_ctime = CURRENT_TIME; | 149 | ret->i_atime = ret->i_mtime = ret->i_ctime = CURRENT_TIME; |
| 152 | } | 150 | } |
| 153 | return ret; | 151 | return ret; |
diff --git a/drivers/oprofile/oprofilefs.c b/drivers/oprofile/oprofilefs.c index ddc4c59f02dc..b7e4cee24269 100644 --- a/drivers/oprofile/oprofilefs.c +++ b/drivers/oprofile/oprofilefs.c | |||
| @@ -29,9 +29,6 @@ static struct inode *oprofilefs_get_inode(struct super_block *sb, int mode) | |||
| 29 | 29 | ||
| 30 | if (inode) { | 30 | if (inode) { |
| 31 | inode->i_mode = mode; | 31 | inode->i_mode = mode; |
| 32 | inode->i_uid = 0; | ||
| 33 | inode->i_gid = 0; | ||
| 34 | inode->i_blocks = 0; | ||
| 35 | inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME; | 32 | inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME; |
| 36 | } | 33 | } |
| 37 | return inode; | 34 | return inode; |
diff --git a/drivers/usb/core/inode.c b/drivers/usb/core/inode.c index 185be760833e..2a129cb7bb56 100644 --- a/drivers/usb/core/inode.c +++ b/drivers/usb/core/inode.c | |||
| @@ -279,7 +279,6 @@ static struct inode *usbfs_get_inode (struct super_block *sb, int mode, dev_t de | |||
| 279 | inode->i_mode = mode; | 279 | inode->i_mode = mode; |
| 280 | inode->i_uid = current_fsuid(); | 280 | inode->i_uid = current_fsuid(); |
| 281 | inode->i_gid = current_fsgid(); | 281 | inode->i_gid = current_fsgid(); |
| 282 | inode->i_blocks = 0; | ||
| 283 | inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME; | 282 | inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME; |
| 284 | switch (mode & S_IFMT) { | 283 | switch (mode & S_IFMT) { |
| 285 | default: | 284 | default: |
diff --git a/drivers/usb/gadget/inode.c b/drivers/usb/gadget/inode.c index eeb26c0f88e5..317b48fdbf01 100644 --- a/drivers/usb/gadget/inode.c +++ b/drivers/usb/gadget/inode.c | |||
| @@ -2001,7 +2001,6 @@ gadgetfs_make_inode (struct super_block *sb, | |||
| 2001 | inode->i_mode = mode; | 2001 | inode->i_mode = mode; |
| 2002 | inode->i_uid = default_uid; | 2002 | inode->i_uid = default_uid; |
| 2003 | inode->i_gid = default_gid; | 2003 | inode->i_gid = default_gid; |
| 2004 | inode->i_blocks = 0; | ||
| 2005 | inode->i_atime = inode->i_mtime = inode->i_ctime | 2004 | inode->i_atime = inode->i_mtime = inode->i_ctime |
| 2006 | = CURRENT_TIME; | 2005 | = CURRENT_TIME; |
| 2007 | inode->i_private = data; | 2006 | inode->i_private = data; |
diff --git a/fs/autofs/inode.c b/fs/autofs/inode.c index c773680d5c60..e1734f2d6e26 100644 --- a/fs/autofs/inode.c +++ b/fs/autofs/inode.c | |||
| @@ -251,13 +251,11 @@ struct inode *autofs_iget(struct super_block *sb, unsigned long ino) | |||
| 251 | inode->i_mode = S_IFDIR | S_IRUGO | S_IXUGO; | 251 | inode->i_mode = S_IFDIR | S_IRUGO | S_IXUGO; |
| 252 | inode->i_nlink = 2; | 252 | inode->i_nlink = 2; |
| 253 | inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME; | 253 | inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME; |
| 254 | inode->i_blocks = 0; | ||
| 255 | 254 | ||
| 256 | if (ino == AUTOFS_ROOT_INO) { | 255 | if (ino == AUTOFS_ROOT_INO) { |
| 257 | inode->i_mode = S_IFDIR | S_IRUGO | S_IXUGO | S_IWUSR; | 256 | inode->i_mode = S_IFDIR | S_IRUGO | S_IXUGO | S_IWUSR; |
| 258 | inode->i_op = &autofs_root_inode_operations; | 257 | inode->i_op = &autofs_root_inode_operations; |
| 259 | inode->i_fop = &autofs_root_operations; | 258 | inode->i_fop = &autofs_root_operations; |
| 260 | inode->i_uid = inode->i_gid = 0; /* Changed in read_super */ | ||
| 261 | goto done; | 259 | goto done; |
| 262 | } | 260 | } |
| 263 | 261 | ||
diff --git a/fs/autofs4/inode.c b/fs/autofs4/inode.c index 7b19802cfef4..cfc23e53b6f4 100644 --- a/fs/autofs4/inode.c +++ b/fs/autofs4/inode.c | |||
| @@ -455,11 +455,7 @@ struct inode *autofs4_get_inode(struct super_block *sb, | |||
| 455 | if (sb->s_root) { | 455 | if (sb->s_root) { |
| 456 | inode->i_uid = sb->s_root->d_inode->i_uid; | 456 | inode->i_uid = sb->s_root->d_inode->i_uid; |
| 457 | inode->i_gid = sb->s_root->d_inode->i_gid; | 457 | inode->i_gid = sb->s_root->d_inode->i_gid; |
| 458 | } else { | ||
| 459 | inode->i_uid = 0; | ||
| 460 | inode->i_gid = 0; | ||
| 461 | } | 458 | } |
| 462 | inode->i_blocks = 0; | ||
| 463 | inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME; | ||
