3 files changed, 33 insertions, 33 deletions

diff --git a/fs/gfs2/ops_file.c b/fs/gfs2/ops_file.c
index 9dcf72aa9f66..b551074a3c98 100644
--- a/fs/gfs2/ops_file.c
+++ b/fs/gfs2/ops_file.c
@@ -94,12 +94,12 @@ static int gfs2_read_actor(read_descriptor_t *desc, struct page *page,
 
         kaddr = kmap(page);
         memcpy(desc->arg.buf, kaddr + offset, size);
-        kunmap(page);
+        kunmap(page);
 
-        desc->count = count - size;
-        desc->written += size;
-        desc->arg.buf += size;
-        return size;
+        desc->count = count - size;
+        desc->written += size;
+        desc->arg.buf += size;
+        return size;
 }
 
 int gfs2_internal_read(struct gfs2_inode *ip, struct file_ra_state *ra_state,
@@ -700,7 +700,7 @@ static int do_flock(struct file *file, int cmd, struct file_lock *fl)
         int error = 0;
 
         state = (fl->fl_type == F_WRLCK) ? LM_ST_EXCLUSIVE : LM_ST_SHARED;
-        flags = ((IS_SETLKW(cmd)) ? 0 : LM_FLAG_TRY) | GL_EXACT | GL_NOCACHE;
+        flags = (IS_SETLKW(cmd) ? 0 : LM_FLAG_TRY) | GL_EXACT | GL_NOCACHE;
 
         mutex_lock(&fp->f_fl_mutex);
 
@@ -780,32 +780,32 @@ static int gfs2_flock(struct file *file, int cmd, struct file_lock *fl)
 }
 
 const struct file_operations gfs2_file_fops = {
-        .llseek = gfs2_llseek,
-        .read = generic_file_read,
-        .readv = generic_file_readv,
-        .aio_read = generic_file_aio_read,
-        .write = generic_file_write,
-        .writev = generic_file_writev,
-        .aio_write = generic_file_aio_write,
-        .unlocked_ioctl = gfs2_ioctl,
-        .mmap = gfs2_mmap,
-        .open = gfs2_open,
-        .release = gfs2_close,
-        .fsync = gfs2_fsync,
-        .lock = gfs2_lock,
-        .sendfile = generic_file_sendfile,
-        .flock = gfs2_flock,
-        .splice_read = generic_file_splice_read,
-        .splice_write = generic_file_splice_write,
+        .llseek         = gfs2_llseek,
+        .read           = generic_file_read,
+        .readv          = generic_file_readv,
+        .aio_read       = generic_file_aio_read,
+        .write          = generic_file_write,
+        .writev         = generic_file_writev,
+        .aio_write      = generic_file_aio_write,
+        .unlocked_ioctl = gfs2_ioctl,
+        .mmap           = gfs2_mmap,
+        .open           = gfs2_open,
+        .release        = gfs2_close,
+        .fsync          = gfs2_fsync,
+        .lock           = gfs2_lock,
+        .sendfile       = generic_file_sendfile,
+        .flock          = gfs2_flock,
+        .splice_read    = generic_file_splice_read,
+        .splice_write   = generic_file_splice_write,
 };
 
 const struct file_operations gfs2_dir_fops = {
-        .readdir = gfs2_readdir,
-        .unlocked_ioctl = gfs2_ioctl,
-        .open = gfs2_open,
-        .release = gfs2_close,
-        .fsync = gfs2_fsync,
-        .lock = gfs2_lock,
-        .flock = gfs2_flock,
+        .readdir        = gfs2_readdir,
+        .unlocked_ioctl = gfs2_ioctl,
+        .open           = gfs2_open,
+        .release        = gfs2_close,
+        .fsync          = gfs2_fsync,
+        .lock           = gfs2_lock,
+        .flock          = gfs2_flock,
 };
 
diff --git a/fs/gfs2/ops_fstype.c b/fs/gfs2/ops_fstype.c
index d39314d5dd0a..c94422b30ceb 100644
--- a/fs/gfs2/ops_fstype.c
+++ b/fs/gfs2/ops_fstype.c
@@ -791,7 +791,7 @@ static int gfs2_get_sb(struct file_system_type *fs_type, int flags,
         if (error)
                 goto out;
         sb = mnt->mnt_sb;
-        sdp = (struct gfs2_sbd*)sb->s_fs_info;
+        sdp = sb->s_fs_info;
         sdp->sd_gfs2mnt = mnt;
 out:
         return error;
@@ -832,7 +832,7 @@ static int set_bdev_super(struct super_block *s, void *data)
  
 static int test_bdev_super(struct super_block *s, void *data)
 {
-        return (void *)s->s_bdev == data;
+        return s->s_bdev == data;
 }
 
 static struct super_block* get_gfs2_sb(const char *dev_name)
diff --git a/fs/gfs2/ops_inode.c b/fs/gfs2/ops_inode.c
index c680f050e17f..2f38313b4bd5 100644
--- a/fs/gfs2/ops_inode.c
+++ b/fs/gfs2/ops_inode.c
@@ -1014,7 +1014,7 @@ out:
 
 /**
  * gfs2_getattr - Read out an inode's attributes
- * @mnt: ?
+ * @mnt: The vfsmount the inode is being accessed from
  * @dentry: The dentry to stat
  * @stat: The inode's stats
  *