From: Steven Whitehouse <swhiteho@redhat.com>
To: cluster-devel@redhat.com, linux-kernel@vger.kernel.org
Cc: Steven Whitehouse <swhiteho@redhat.com>
Subject: [PATCH 22/24] GFS2: Misc fixes
Date: Mon, 24 Oct 2011 13:48:36 +0100 [thread overview]
Message-ID: <1319460518-9046-23-git-send-email-swhiteho@redhat.com> (raw)
In-Reply-To: <1319460518-9046-1-git-send-email-swhiteho@redhat.com>
Some items picked up through automated code analysis. A few bits
of unreachable code and two unchecked return values.
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
diff --git a/fs/gfs2/lops.c b/fs/gfs2/lops.c
index de05b4d..0301be6 100644
--- a/fs/gfs2/lops.c
+++ b/fs/gfs2/lops.c
@@ -695,8 +695,6 @@ static int databuf_lo_scan_elements(struct gfs2_jdesc *jd, unsigned int start,
brelse(bh_log);
brelse(bh_ip);
- if (error)
- break;
sdp->sd_replayed_blocks++;
}
diff --git a/fs/gfs2/ops_fstype.c b/fs/gfs2/ops_fstype.c
index 69166ff..7e823bb 100644
--- a/fs/gfs2/ops_fstype.c
+++ b/fs/gfs2/ops_fstype.c
@@ -651,7 +651,6 @@ static int init_journal(struct gfs2_sbd *sdp, int undo)
fs_err(sdp, "can't lookup journal index: %d\n", error);
return PTR_ERR(sdp->sd_jindex);
}
- ip = GFS2_I(sdp->sd_jindex);
/* Load in the journal index special file */
@@ -763,7 +762,6 @@ fail:
static int init_inodes(struct gfs2_sbd *sdp, int undo)
{
int error = 0;
- struct gfs2_inode *ip;
struct inode *master = sdp->sd_master_dir->d_inode;
if (undo)
@@ -788,7 +786,6 @@ static int init_inodes(struct gfs2_sbd *sdp, int undo)
fs_err(sdp, "can't get resource index inode: %d\n", error);
goto fail_statfs;
}
- ip = GFS2_I(sdp->sd_rindex);
sdp->sd_rindex_uptodate = 0;
/* Read in the quota inode */
diff --git a/fs/gfs2/quota.c b/fs/gfs2/quota.c
index 10a59cd..7e528dc 100644
--- a/fs/gfs2/quota.c
+++ b/fs/gfs2/quota.c
@@ -645,8 +645,11 @@ static int gfs2_adjust_quota(struct gfs2_inode *ip, loff_t loc,
int err, nbytes;
u64 size;
- if (gfs2_is_stuffed(ip))
- gfs2_unstuff_dinode(ip, NULL);
+ if (gfs2_is_stuffed(ip)) {
+ err = gfs2_unstuff_dinode(ip, NULL);
+ if (err)
+ return err;
+ }
memset(&q, 0, sizeof(struct gfs2_quota));
err = gfs2_internal_read(ip, NULL, (char *)&q, &loc, sizeof(q));
@@ -927,7 +930,9 @@ int gfs2_quota_lock(struct gfs2_inode *ip, u32 uid, u32 gid)
unsigned int x;
int error = 0;
- gfs2_quota_hold(ip, uid, gid);
+ error = gfs2_quota_hold(ip, uid, gid);
+ if (error)
+ return error;
if (capable(CAP_SYS_RESOURCE) ||
sdp->sd_args.ar_quota != GFS2_QUOTA_ON)
--
1.7.4.4
next prev parent reply other threads:[~2011-10-24 12:48 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-24 12:48 GFS2: Pre-pull patch posting (merge window) Steven Whitehouse
2011-10-24 12:48 ` [PATCH 01/24] GFS2: Clean up dir hash table reading Steven Whitehouse
2011-10-24 12:48 ` [PATCH 02/24] GFS2: Split data write & wait in fsync Steven Whitehouse
2011-10-24 12:48 ` [PATCH 03/24] GFS2: Fix bug-trap in ail flush code Steven Whitehouse
2011-10-24 12:48 ` [PATCH 04/24] GFS2: Make atime checks more efficient Steven Whitehouse
2011-10-24 12:48 ` [PATCH 05/24] GFS2: Fix inode allocation error path Steven Whitehouse
2011-10-24 12:48 ` [PATCH 06/24] GFS2: Fix bug trap and journaled data fsync Steven Whitehouse
2011-10-24 12:48 ` [PATCH 07/24] GFS2: Use ->dirty_inode() Steven Whitehouse
2011-10-24 12:48 ` [PATCH 08/24] GFS2: Clean up gfs2_create Steven Whitehouse
2011-10-24 12:48 ` [PATCH 09/24] GFS2: Fix lseek after SEEK_DATA, SEEK_HOLE have been added Steven Whitehouse
2011-10-25 7:54 ` Andi Kleen
2011-10-24 12:48 ` [PATCH 10/24] GFS2: Use rbtree for resource groups and clean up bitmap buffer ref count scheme Steven Whitehouse
2011-10-24 12:48 ` [PATCH 11/24] GFS2: Make resource groups "append only" during life of fs Steven Whitehouse
2011-10-24 12:48 ` [PATCH 12/24] GFS2: Cache the most recently used resource group in the inode Steven Whitehouse
2011-10-24 12:48 ` [PATCH 13/24] GFS2: Remove obsolete assert Steven Whitehouse
2011-10-24 12:48 ` [PATCH 14/24] GFS2: Call do_strip() directly from recursive_scan() Steven Whitehouse
2011-10-24 12:48 ` [PATCH 15/24] GFS2: Use cached rgrp in gfs2_rlist_add() Steven Whitehouse
2011-10-24 12:48 ` [PATCH 16/24] GFS2: Fix AIL flush issue during fsync Steven Whitehouse
2011-10-24 12:48 ` [PATCH 17/24] GFS2: Correctly set goal block after allocation Steven Whitehouse
2011-10-24 12:48 ` [PATCH 18/24] GFS2: Clean up ->page_mkwrite Steven Whitehouse
2011-10-24 12:48 ` [PATCH 19/24] GFS2: Fix off-by-one in gfs2_blk2rgrpd Steven Whitehouse
2011-10-24 12:48 ` [PATCH 20/24] GFS2: speed up delete/unlink performance for large files Steven Whitehouse
2011-10-24 12:48 ` [PATCH 21/24] GFS2: rewrite fallocate code to write blocks directly Steven Whitehouse
2011-10-24 12:48 ` Steven Whitehouse [this message]
2011-10-24 12:48 ` [PATCH 23/24] GFS2: Remove two unused variables Steven Whitehouse
2011-10-24 12:48 ` [PATCH 24/24] GFS2: Move readahead of metadata during deallocation into its own function Steven Whitehouse
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1319460518-9046-23-git-send-email-swhiteho@redhat.com \
--to=swhiteho@redhat.com \
--cc=cluster-devel@redhat.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®