[GFS2] Remove the "greedy" function from glock.[ch]

The "greedy" code was an attempt to retain glocks for a minimum length
of time when they relate to mmap()ed files. The current implementation
of this feature is not, however, ideal in that it required allocating
memory in order to do this and its overly complicated.

It also misses the mark by ignoring the other I/O operations which are
just as likely to suffer from the same problem. So the plan is to remove
this now and then add the functionality back as part of the glock state
machine at a later date (and thus take into account all the possible
users of this feature)

Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>

1 files changed, 1 insertions, 23 deletions

diff --git a/fs/gfs2/ops_vm.c b/fs/gfs2/ops_vm.c
index 45a5f11fc39a..14b380fb0602 100644
--- a/fs/gfs2/ops_vm.c
+++ b/fs/gfs2/ops_vm.c
@@ -28,34 +28,13 @@
 #include "trans.h"
 #include "util.h"
 
-static void pfault_be_greedy(struct gfs2_inode *ip)
-{
-        unsigned int time;
-
-        spin_lock(&ip->i_spin);
-        time = ip->i_greedy;
-        ip->i_last_pfault = jiffies;
-        spin_unlock(&ip->i_spin);
-
-        igrab(&ip->i_inode);
-        if (gfs2_glock_be_greedy(ip->i_gl, time))
-                iput(&ip->i_inode);
-}
-
 static struct page *gfs2_private_nopage(struct vm_area_struct *area,
                                         unsigned long address, int *type)
 {
         struct gfs2_inode *ip = GFS2_I(area->vm_file->f_mapping->host);
-        struct page *result;
 
         set_bit(GIF_PAGED, &ip->i_flags);
-
-        result = filemap_nopage(area, address, type);
-
-        if (result && result != NOPAGE_OOM)
-                pfault_be_greedy(ip);
-
-        return result;
+        return filemap_nopage(area, address, type);
 }
 
 static int alloc_page_backing(struct gfs2_inode *ip, struct page *page)
@@ -167,7 +146,6 @@ static struct page *gfs2_sharewrite_nopage(struct vm_area_struct *area,
                 set_page_dirty(result);
         }
 
-        pfault_be_greedy(ip);
 out:
         gfs2_glock_dq_uninit(&i_gh);