lkml.org 
[lkml]   [2019]   [Dec]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] gfs2: remove assertion when journal_info is not empty
Date
In gfs2_trans_begin, avoid crashing when current->journal_info
is not empty. The patch fixes the error by returning -EINVAL
instead of crashing.

Signed-off-by: Aditya Pakki <pakki001@umn.edu>
---
fs/gfs2/trans.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/fs/gfs2/trans.c b/fs/gfs2/trans.c
index 9d4227330de4..cef8816ae0b4 100644
--- a/fs/gfs2/trans.c
+++ b/fs/gfs2/trans.c
@@ -31,7 +31,9 @@ int gfs2_trans_begin(struct gfs2_sbd *sdp, unsigned int blocks,
struct gfs2_trans *tr;
int error;

- BUG_ON(current->journal_info);
+ if (current->journal_info)
+ return -EINVAL;
+
BUG_ON(blocks == 0 && revokes == 0);

if (!test_bit(SDF_JOURNAL_LIVE, &sdp->sd_flags))
--
2.20.1
\
 
 \ /
  Last update: 2019-12-15 17:47    [W:0.023 / U:0.668 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site