aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/gfs2/file.c2
-rw-r--r--fs/gfs2/lops.c2
2 files changed, 0 insertions, 4 deletions
diff --git a/fs/gfs2/file.c b/fs/gfs2/file.c
index 0def0504afc1..377a68dbd066 100644
--- a/fs/gfs2/file.c
+++ b/fs/gfs2/file.c
@@ -677,10 +677,8 @@ static ssize_t gfs2_file_aio_write(struct kiocb *iocb, const struct iovec *iov,
677 size_t writesize = iov_length(iov, nr_segs); 677 size_t writesize = iov_length(iov, nr_segs);
678 struct dentry *dentry = file->f_dentry; 678 struct dentry *dentry = file->f_dentry;
679 struct gfs2_inode *ip = GFS2_I(dentry->d_inode); 679 struct gfs2_inode *ip = GFS2_I(dentry->d_inode);
680 struct gfs2_sbd *sdp;
681 int ret; 680 int ret;
682 681
683 sdp = GFS2_SB(file->f_mapping->host);
684 ret = gfs2_rs_alloc(ip); 682 ret = gfs2_rs_alloc(ip);
685 if (ret) 683 if (ret)
686 return ret; 684 return ret;
diff --git a/fs/gfs2/lops.c b/fs/gfs2/lops.c
index 8ff95a2d54ee..01e444b5b2bd 100644
--- a/fs/gfs2/lops.c
+++ b/fs/gfs2/lops.c
@@ -621,7 +621,6 @@ static void revoke_lo_add(struct gfs2_sbd *sdp, struct gfs2_bufdata *bd)
621 621
622static void revoke_lo_before_commit(struct gfs2_sbd *sdp) 622static void revoke_lo_before_commit(struct gfs2_sbd *sdp)
623{ 623{
624 struct gfs2_log_descriptor *ld;
625 struct gfs2_meta_header *mh; 624 struct gfs2_meta_header *mh;
626 unsigned int offset; 625 unsigned int offset;
627 struct list_head *head = &sdp->sd_log_le_revoke; 626 struct list_head *head = &sdp->sd_log_le_revoke;
@@ -634,7 +633,6 @@ static void revoke_lo_before_commit(struct gfs2_sbd *sdp)
634 633
635 length = gfs2_struct2blk(sdp, sdp->sd_log_num_revoke, sizeof(u64)); 634 length = gfs2_struct2blk(sdp, sdp->sd_log_num_revoke, sizeof(u64));
636 page = gfs2_get_log_desc(sdp, GFS2_LOG_DESC_REVOKE, length, sdp->sd_log_num_revoke); 635 page = gfs2_get_log_desc(sdp, GFS2_LOG_DESC_REVOKE, length, sdp->sd_log_num_revoke);
637 ld = page_address(page);
638 offset = sizeof(struct gfs2_log_descriptor); 636 offset = sizeof(struct gfs2_log_descriptor);
639 637
640 list_for_each_entry(bd, head, bd_list) { 638 list_for_each_entry(bd, head, bd_list) {