diff options
Diffstat (limited to 'fs/configfs')
| -rw-r--r-- | fs/configfs/file.c | 3 | ||||
| -rw-r--r-- | fs/configfs/inode.c | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/fs/configfs/file.c b/fs/configfs/file.c index f499803743e0..85105e50f7db 100644 --- a/fs/configfs/file.c +++ b/fs/configfs/file.c | |||
| @@ -274,9 +274,8 @@ static int check_perm(struct inode * inode, struct file * file) | |||
| 274 | /* No error? Great, allocate a buffer for the file, and store it | 274 | /* No error? Great, allocate a buffer for the file, and store it |
| 275 | * it in file->private_data for easy access. | 275 | * it in file->private_data for easy access. |
| 276 | */ | 276 | */ |
| 277 | buffer = kmalloc(sizeof(struct configfs_buffer),GFP_KERNEL); | 277 | buffer = kzalloc(sizeof(struct configfs_buffer),GFP_KERNEL); |
| 278 | if (buffer) { | 278 | if (buffer) { |
| 279 | memset(buffer,0,sizeof(struct configfs_buffer)); | ||
| 280 | init_MUTEX(&buffer->sem); | 279 | init_MUTEX(&buffer->sem); |
| 281 | buffer->needs_read_fill = 1; | 280 | buffer->needs_read_fill = 1; |
| 282 | buffer->ops = ops; | 281 | buffer->ops = ops; |
diff --git a/fs/configfs/inode.c b/fs/configfs/inode.c index e14488ca6411..fb18917954a9 100644 --- a/fs/configfs/inode.c +++ b/fs/configfs/inode.c | |||
| @@ -76,11 +76,10 @@ int configfs_setattr(struct dentry * dentry, struct iattr * iattr) | |||
| 76 | 76 | ||
| 77 | if (!sd_iattr) { | 77 | if (!sd_iattr) { |
| 78 | /* setting attributes for the first time, allocate now */ | 78 | /* setting attributes for the first time, allocate now */ |
| 79 | sd_iattr = kmalloc(sizeof(struct iattr), GFP_KERNEL); | 79 | sd_iattr = kzalloc(sizeof(struct iattr), GFP_KERNEL); |
| 80 | if (!sd_iattr) | 80 | if (!sd_iattr) |
| 81 | return -ENOMEM; | 81 | return -ENOMEM; |
| 82 | /* assign default attributes */ | 82 | /* assign default attributes */ |
| 83 | memset(sd_iattr, 0, sizeof(struct iattr)); | ||
| 84 | sd_iattr->ia_mode = sd->s_mode; | 83 | sd_iattr->ia_mode = sd->s_mode; |
| 85 | sd_iattr->ia_uid = 0; | 84 | sd_iattr->ia_uid = 0; |
| 86 | sd_iattr->ia_gid = 0; | 85 | sd_iattr->ia_gid = 0; |
| @@ -136,7 +135,6 @@ struct inode * configfs_new_inode(mode_t mode, struct configfs_dirent * sd) | |||
| 136 | { | 135 | { |
| 137 | struct inode * inode = new_inode(configfs_sb); | 136 | struct inode * inode = new_inode(configfs_sb); |
| 138 | if (inode) { | 137 | if (inode) { |
| 139 | inode->i_blksize = PAGE_CACHE_SIZE; | ||
| 140 | inode->i_blocks = 0; | 138 | inode->i_blocks = 0; |
| 141 | inode->i_mapping->a_ops = &configfs_aops; | 139 | inode->i_mapping->a_ops = &configfs_aops; |
| 142 | inode->i_mapping->backing_dev_info = &configfs_backing_dev_info; | 140 | inode->i_mapping->backing_dev_info = &configfs_backing_dev_info; |
