summaryrefslogtreecommitdiffstats
path: root/fs/ext4
diff options
context:
space:
mode:
authorLukas Czerner <lczerner@redhat.com>2010-10-28 03:30:11 +0200
committerTheodore Ts'o <tytso@mit.edu>2010-10-28 03:30:11 +0200
commit77ca6cdf0ab8a42f481ec997911bc89e79138723 (patch)
tree30f6cb268a3b4cad391e5784557b2c6432b52691 /fs/ext4
parentext4: Check return value of sb_getblk() and friends (diff)
downloadlinux-77ca6cdf0ab8a42f481ec997911bc89e79138723.tar.xz
linux-77ca6cdf0ab8a42f481ec997911bc89e79138723.zip
ext4: Use return value from sb_issue_discard()
Use return value from sb_issue_discard() as return value in ext4_issue_discard(). Since sb_issue_discard() may result in more serious errors than just -EOPNOTSUPP it is worth to inform user of this function about them to handle error cases properly. Signed-off-by: Lukas Czerner <lczerner@redhat.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'fs/ext4')
-rw-r--r--fs/ext4/mballoc.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
index 611c866ef3fe..11c2eec386ef 100644
--- a/fs/ext4/mballoc.c
+++ b/fs/ext4/mballoc.c
@@ -2603,7 +2603,7 @@ int ext4_mb_release(struct super_block *sb)
return 0;
}
-static inline void ext4_issue_discard(struct super_block *sb,
+static inline int ext4_issue_discard(struct super_block *sb,
ext4_group_t block_group, ext4_grpblk_t block, int count)
{
int ret;
@@ -2617,6 +2617,7 @@ static inline void ext4_issue_discard(struct super_block *sb,
ext4_warning(sb, "discard not supported, disabling");
clear_opt(EXT4_SB(sb)->s_mount_opt, DISCARD);
}
+ return ret;
}
/*