Commit 001e8e8df4283dd4ef7a0297c012fce364c05cf1
1 parent
0ee532062f
GFS2: Don't try to deallocate unlinked inodes when mounted ro
This adds a couple of missing tests to avoid read-only nodes from attempting to deallocate unlinked inodes. Signed-off-by: Steven Whitehouse <swhiteho@redhat.com> Reported-by: Michel Andre de la Porte <madelaporte@ubi.com>
Showing 2 changed files with 7 additions and 2 deletions Side-by-side Diff
fs/gfs2/glops.c
| ... | ... | @@ -385,6 +385,10 @@ |
| 385 | 385 | static void iopen_go_callback(struct gfs2_glock *gl) |
| 386 | 386 | { |
| 387 | 387 | struct gfs2_inode *ip = (struct gfs2_inode *)gl->gl_object; |
| 388 | + struct gfs2_sbd *sdp = gl->gl_sbd; | |
| 389 | + | |
| 390 | + if (sdp->sd_vfs->s_flags & MS_RDONLY) | |
| 391 | + return; | |
| 388 | 392 | |
| 389 | 393 | if (gl->gl_demote_state == LM_ST_UNLOCKED && |
| 390 | 394 | gl->gl_state == LM_ST_SHARED && ip) { |
fs/gfs2/super.c
| ... | ... | @@ -1318,12 +1318,13 @@ |
| 1318 | 1318 | |
| 1319 | 1319 | static void gfs2_evict_inode(struct inode *inode) |
| 1320 | 1320 | { |
| 1321 | - struct gfs2_sbd *sdp = inode->i_sb->s_fs_info; | |
| 1321 | + struct super_block *sb = inode->i_sb; | |
| 1322 | + struct gfs2_sbd *sdp = sb->s_fs_info; | |
| 1322 | 1323 | struct gfs2_inode *ip = GFS2_I(inode); |
| 1323 | 1324 | struct gfs2_holder gh; |
| 1324 | 1325 | int error; |
| 1325 | 1326 | |
| 1326 | - if (inode->i_nlink) | |
| 1327 | + if (inode->i_nlink || (sb->s_flags & MS_RDONLY)) | |
| 1327 | 1328 | goto out; |
| 1328 | 1329 | |
| 1329 | 1330 | error = gfs2_glock_nq_init(ip->i_gl, LM_ST_EXCLUSIVE, 0, &gh); |