[GFS2] Patch to remove stats counters from GFS2 (II)

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

diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
index cf1dc17faf4f4d1083f13de1b59d7f06a4ca9b63..d4fa395ed39f2fcfdb5f9ce9d6e38db4a44deba4 100644 (file)
--- a/fs/gfs2/glock.c
+++ b/fs/gfs2/glock.c
@@ -825,7 +825,6 @@ static void handle_callback(struct gfs2_glock *gl, unsigned int state)
 
 static void state_change(struct gfs2_glock *gl, unsigned int new_state)
 {
-       struct gfs2_sbd *sdp = gl->gl_sbd;
        int held1, held2;
 
        held1 = (gl->gl_state != LM_ST_UNLOCKED);
@@ -1390,7 +1389,6 @@ int gfs2_glock_wait(struct gfs2_holder *gh)
 void gfs2_glock_dq(struct gfs2_holder *gh)
 {
        struct gfs2_glock *gl = gh->gh_gl;
-       struct gfs2_sbd *sdp = gl->gl_sbd;
        struct gfs2_glock_operations *glops = gl->gl_ops;
 
        if (gh->gh_flags & GL_SYNC)

diff --git a/fs/gfs2/ops_dentry.c b/fs/gfs2/ops_dentry.c
index fb8f70d225b91d3e3733c2217b9a06dd5b953374..b020ad8f180b95c64917f96b4fee5040dd6aa348 100644 (file)
--- a/fs/gfs2/ops_dentry.c
+++ b/fs/gfs2/ops_dentry.c
@@ -35,7 +35,6 @@ static int gfs2_drevalidate(struct dentry *dentry, struct nameidata *nd)
 {
        struct dentry *parent = dget_parent(dentry);
        struct gfs2_inode *dip = get_v2ip(parent->d_inode);
-       struct gfs2_sbd *sdp = dip->i_sbd;
        struct inode *inode;
        struct gfs2_holder d_gh;
        struct gfs2_inode *ip;

diff --git a/fs/gfs2/ops_export.c b/fs/gfs2/ops_export.c
index 611252b7a0d671c900ea60024dbeca6bfcd089dd..60d006402553f96c57581550c14d85c36cdd7e29 100644 (file)
--- a/fs/gfs2/ops_export.c
+++ b/fs/gfs2/ops_export.c
@@ -161,7 +161,6 @@ static int gfs2_get_name(struct dentry *parent, char *name,
 
 static struct dentry *gfs2_get_parent(struct dentry *child)
 {
-       struct gfs2_inode *dip = get_v2ip(child->d_inode);
        struct qstr dotdot = { .name = "..", .len = 2 };
        struct inode *inode;
        struct dentry *dentry;

diff --git a/fs/gfs2/ops_file.c b/fs/gfs2/ops_file.c
index 0f80e9306016cf9bc8ddfbe8e6cf6d9c8b7a4b88..989f0f70fc2ec41c95f5548e47837e0fe5380b5c 100644 (file)
--- a/fs/gfs2/ops_file.c
+++ b/fs/gfs2/ops_file.c
@@ -299,7 +299,6 @@ static ssize_t gfs2_file_readv(struct file *filp, const struct iovec *iov,
 static ssize_t gfs2_file_aio_read(struct kiocb *iocb, char __user *buf,
                                  size_t count, loff_t pos)
 {
-       struct file *filp = iocb->ki_filp;
         struct iovec local_iov = { .iov_base = buf, .iov_len = count };
 
         BUG_ON(iocb->ki_pos != pos);
@@ -818,7 +817,6 @@ static int gfs2_lock(struct file *file, int cmd, struct file_lock *fl)
 static ssize_t gfs2_sendfile(struct file *in_file, loff_t *offset, size_t count,
                             read_actor_t actor, void *target)
 {
-       struct gfs2_inode *ip = get_v2ip(in_file->f_mapping->host);
        return generic_file_sendfile(in_file, offset, count, actor, target);
 }