1 files changed, 10 insertions, 3 deletions

diff --git a/fs/gfs2/ops_super.c b/fs/gfs2/ops_super.c
index 7685b46f934b..b89999d3a767 100644
--- a/fs/gfs2/ops_super.c
+++ b/fs/gfs2/ops_super.c
@@ -173,6 +173,9 @@ static void gfs2_write_super_lockfs(struct super_block *sb)
         struct gfs2_sbd *sdp = sb->s_fs_info;
         int error;
 
+        if (test_bit(SDF_SHUTDOWN, &sdp->sd_flags))
+                return;
+
         for (;;) {
                 error = gfs2_freeze_fs(sdp);
                 if (!error)
@@ -426,6 +429,12 @@ static void gfs2_delete_inode(struct inode *inode)
         }
 
         error = gfs2_dinode_dealloc(ip);
+        /*
+         * Must do this before unlock to avoid trying to write back
+         * potentially dirty data now that inode no longer exists
+         * on disk.
+         */
+        truncate_inode_pages(&inode->i_data, 0);
 
 out_unlock:
         gfs2_glock_dq(&ip->i_iopen_gh);
@@ -443,14 +452,12 @@ out:
 
 static struct inode *gfs2_alloc_inode(struct super_block *sb)
 {
-        struct gfs2_sbd *sdp = sb->s_fs_info;
         struct gfs2_inode *ip;
 
         ip = kmem_cache_alloc(gfs2_inode_cachep, GFP_KERNEL);
         if (ip) {
                 ip->i_flags = 0;
                 ip->i_gl = NULL;
-                ip->i_greedy = gfs2_tune_get(sdp, gt_greedy_default);
                 ip->i_last_pfault = jiffies;
         }
         return &ip->i_inode;
@@ -461,7 +468,7 @@ static void gfs2_destroy_inode(struct inode *inode)
         kmem_cache_free(gfs2_inode_cachep, inode);
 }
 
-struct super_operations gfs2_super_ops = {
+const struct super_operations gfs2_super_ops = {
         .alloc_inode            = gfs2_alloc_inode,
         .destroy_inode          = gfs2_destroy_inode,
         .write_inode            = gfs2_write_inode,