---

yaml
---
r: 38680
b: refs/heads/master
c: 56409ab
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bac1e07926ae514739e6a12218c8b6ce8ce04514
+refs/heads/master: 56409abbf8a9e3754d752d0189f9b9a609ec78de

trunk/fs/gfs2/bmap.c

@@ -48,37 +48,6 @@ struct strip_mine {
 	unsigned int sm_height;
 };
 
-/**
- * @gfs2_unstuffer_sync - Synchronously unstuff a dinode
- * @ip:
- * @dibh:
- * @block:
- * @private:
- *
- * Cheat and use a metadata buffer instead of a data page.
- *
- * Returns: errno
- */
-#if 0
-int gfs2_unstuffer_sync(struct gfs2_inode *ip, struct buffer_head *dibh,
-			uint64_t block, void *private)
-{
-	struct buffer_head *bh;
-	int error;
-
-	bh = gfs2_meta_new(ip->i_gl, block);
-
-	gfs2_buffer_copy_tail(bh, 0, dibh, sizeof(struct gfs2_dinode));
-
-	set_buffer_dirty(bh);
-	error = sync_dirty_buffer(bh);
-
-	brelse(bh);
-
-	return error;
-}
-#endif  /*  0  */
-
 /**
  * gfs2_unstuff_dinode - Unstuff a dinode when the data has grown too big
  * @ip: The GFS2 inode to unstuff

trunk/fs/gfs2/eattr.c

@@ -358,33 +358,6 @@ static int ea_remove_unstuffed(struct gfs2_inode *ip, struct buffer_head *bh,
 	return error;
 }
 
-#if 0
-
-static int gfs2_ea_repack_i(struct gfs2_inode *ip)
-{
-	return -EOPNOTSUPP;
-}
-
-int gfs2_ea_repack(struct gfs2_inode *ip)
-{
-	struct gfs2_holder gh;
-	int error;
-
-	error = gfs2_glock_nq_init(ip->i_gl, LM_ST_EXCLUSIVE, 0, &gh);
-	if (error)
-		return error;
-
-	/* Some sort of permissions checking would be nice */
-
-	error = gfs2_ea_repack_i(ip);
-
-	gfs2_glock_dq_uninit(&gh);
-
-	return error;
-}
-
-#endif  /*  0  */
-
 struct ea_list {
 	struct gfs2_ea_request *ei_er;
 	unsigned int ei_size;

trunk/fs/gfs2/glock.c

@@ -1328,29 +1328,6 @@ static void gfs2_glock_prefetch(struct gfs2_glock *gl, unsigned int state,
 	glops->go_xmote_th(gl, state, flags);
 }
 
-/**
- * gfs2_glock_force_drop - Force a glock to be uncached
- * @gl: the glock
- *
- */
-#if 0
-void gfs2_glock_force_drop(struct gfs2_glock *gl)
-{
-	struct gfs2_holder gh;
-
-	gfs2_holder_init(gl, LM_ST_UNLOCKED, 0, &gh);
-	set_bit(HIF_DEMOTE, &gh.gh_iflags);
-
-	spin_lock(&gl->gl_spin);
-	list_add_tail(&gh.gh_list, &gl->gl_waiters2);
-	run_queue(gl);
-	spin_unlock(&gl->gl_spin);
-
-	wait_for_completion(&gh.gh_wait);
-	gfs2_holder_uninit(&gh);
-}
-#endif  /*  0  */
-
 static void greedy_work(void *data)
 {
 	struct greedy *gr = data;

trunk/fs/gfs2/lvb.c

@@ -43,13 +43,4 @@ void gfs2_quota_lvb_out(struct gfs2_quota_lvb *qb, char *lvb)
 	str->qb_value = cpu_to_be64(qb->qb_value);
 }
 
-#if 0
-void gfs2_quota_lvb_print(struct gfs2_quota_lvb *qb)
-{
-	pv(qb, qb_magic, "%u");
-	pv(qb, qb_limit, "%llu");
-	pv(qb, qb_warn, "%llu");
-	pv(qb, qb_value, "%lld");
-}
-#endif  /*  0  */