[GFS2] Eliminate one instance of __GFP_NOFAIL
This removes one instance of GFP_NOFAIL from the glock callback
function. It also fixes a bug where a , was used at a line end
rather than ; causing unintended results.
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
index 35bac90..dbeb4ad 100644
--- a/fs/gfs2/glock.c
+++ b/fs/gfs2/glock.c
@@ -416,7 +416,7 @@
* @gl: the glock
* @state: the state we're requesting
* @flags: the modifier flags
- * @gfp_flags: __GFP_NOFAIL
+ * @gfp_flags:
*
* Figure out how big an impact this function has. Either:
* 1) Replace it with a cache of structures hanging off the struct gfs2_sbd
@@ -720,6 +720,7 @@
* @gl: the glock
* @state: the state the caller wants us to change to
*
+ * Note: This may fail sliently if we are out of memory.
*/
static void handle_callback(struct gfs2_glock *gl, unsigned int state)
@@ -744,8 +745,9 @@
} else {
spin_unlock(&gl->gl_spin);
- new_gh = gfs2_holder_get(gl, state, LM_FLAG_TRY,
- GFP_KERNEL | __GFP_NOFAIL),
+ new_gh = gfs2_holder_get(gl, state, LM_FLAG_TRY, GFP_KERNEL);
+ if (!new_gh)
+ return;
set_bit(HIF_DEMOTE, &new_gh->gh_iflags);
set_bit(HIF_DEALLOC, &new_gh->gh_iflags);
diff --git a/fs/gfs2/ops_inode.c b/fs/gfs2/ops_inode.c
index 5d5ebbc..8895baa 100644
--- a/fs/gfs2/ops_inode.c
+++ b/fs/gfs2/ops_inode.c
@@ -962,10 +962,8 @@
brelse(dibh);
if (ouid != NO_QUOTA_CHANGE || ogid != NO_QUOTA_CHANGE) {
- gfs2_quota_change(ip, -ip->i_di.di_blocks,
- ouid, ogid);
- gfs2_quota_change(ip, ip->i_di.di_blocks,
- nuid, ngid);
+ gfs2_quota_change(ip, -ip->i_di.di_blocks, ouid, ogid);
+ gfs2_quota_change(ip, ip->i_di.di_blocks, nuid, ngid);
}
out_end_trans:
