summaryrefslogtreecommitdiffstats
path: root/fs/udf
diff options
context:
space:
mode:
authorMarkus Elfring <elfring@users.sourceforge.net>2017-08-15 16:14:19 +0200
committerJan Kara <jack@suse.cz>2017-08-16 16:43:23 +0200
commitb5f5245491b4bea1fd75dfd535e0ea7ec2071b3c (patch)
tree8c95f2642dce2b18f115554d5a3b358bb54dc86f /fs/udf
parent033c9da00893e90dcff0a714bcb5d66890ad818a (diff)
downloadlinux-stable-b5f5245491b4bea1fd75dfd535e0ea7ec2071b3c.tar.gz
linux-stable-b5f5245491b4bea1fd75dfd535e0ea7ec2071b3c.tar.bz2
linux-stable-b5f5245491b4bea1fd75dfd535e0ea7ec2071b3c.zip
fs-udf: Delete an error message for a failed memory allocation in two functions
Omit an extra message for a memory allocation failure in these functions. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring <elfring@users.sourceforge.net> Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/udf')
-rw-r--r--fs/udf/inode.c7
-rw-r--r--fs/udf/super.c2
2 files changed, 1 insertions, 8 deletions
diff --git a/fs/udf/inode.c b/fs/udf/inode.c
index 2bdb68215771..8dacf4f57414 100644
--- a/fs/udf/inode.c
+++ b/fs/udf/inode.c
@@ -1572,13 +1572,8 @@ static int udf_alloc_i_data(struct inode *inode, size_t size)
{
struct udf_inode_info *iinfo = UDF_I(inode);
iinfo->i_ext.i_data = kmalloc(size, GFP_KERNEL);
-
- if (!iinfo->i_ext.i_data) {
- udf_err(inode->i_sb, "(ino %ld) no free memory\n",
- inode->i_ino);
+ if (!iinfo->i_ext.i_data)
return -ENOMEM;
- }
-
return 0;
}
diff --git a/fs/udf/super.c b/fs/udf/super.c
index d772c9c676d0..93c59630512b 100644
--- a/fs/udf/super.c
+++ b/fs/udf/super.c
@@ -268,8 +268,6 @@ static int udf_sb_alloc_partition_maps(struct super_block *sb, u32 count)
sbi->s_partmaps = kcalloc(count, sizeof(*sbi->s_partmaps), GFP_KERNEL);
if (!sbi->s_partmaps) {
- udf_err(sb, "Unable to allocate space for %d partition maps\n",
- count);
sbi->s_partitions = 0;
return -ENOMEM;
}