From f61e22fcb84066a65d2d87d8623b69e3f0b38704 Mon Sep 17 00:00:00 2001 From: Steven Whitehouse Date: Tue, 19 May 2009 14:25:16 +0100 Subject: [PATCH] --- yaml --- r: 146921 b: refs/heads/master c: ef9e8b14a5c1d0afbaf12b4c3b271188ddfc52a4 h: refs/heads/master i: 146919: d183ae3b657d70c9c5da29e62b6df8f0f266bcba v: v3 --- [refs] | 2 +- trunk/fs/gfs2/ops_super.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 4cb374a1c2b3..deb58c282a0e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e9ccb73ab57ada469602506496c42e5b4468ac3e +refs/heads/master: ef9e8b14a5c1d0afbaf12b4c3b271188ddfc52a4 diff --git a/trunk/fs/gfs2/ops_super.c b/trunk/fs/gfs2/ops_super.c index a3c2272e7cad..2fd1dcbcc5b7 100644 --- a/trunk/fs/gfs2/ops_super.c +++ b/trunk/fs/gfs2/ops_super.c @@ -714,7 +714,7 @@ static void gfs2_delete_inode(struct inode *inode) gfs2_glock_dq(&ip->i_iopen_gh); gfs2_holder_uninit(&ip->i_iopen_gh); gfs2_glock_dq_uninit(&gh); - if (error && error != GLR_TRYFAILED) + if (error && error != GLR_TRYFAILED && error != -EROFS) fs_warn(sdp, "gfs2_delete_inode: %d\n", error); out: truncate_inode_pages(&inode->i_data, 0);