From: Lukas Czerner Date: Thu, 28 Oct 2010 01:30:11 +0000 (-0400) Subject: ext4: Use return value from sb_issue_discard() X-Git-Tag: v2.6.37-rc1~76^2^2~17 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=77ca6cdf0ab8a42f481ec997911bc89e79138723;p=~emulex%2Finfiniband.git 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 Signed-off-by: "Theodore Ts'o" --- diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index 611c866ef3f..11c2eec386e 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; } /*