GFS2: Pull request (merge window)

From: Steven Whitehouse
Date: Wed Oct 08 2014 - 15:26:01 EST


Please consider pulling the following changes,


The following changes since commit 37504a3be90b69438426d74ccf467a9fe192932b:

Merge tag 'gfs2-fixes' of git:// (2014-09-16 07:47:04 -0700)

are available in the git repository at:

git:// tags/gfs2-merge-window

for you to fetch changes up to d29c0afe4db72ceb72149c3894a6079674e9751f:

GFS2: use _RET_IP_ instead of (unsigned long)__builtin_return_address(0) (2014-10-08 09:57:07 +0100)

This time we have a couple of bug fixes, one relating to bad i_goal values
which are now ignored (i_goal is basically a hint so it is safe to so this)
and another relating to the saving of the dirent location during rename.

There is one performance improvement, which is an optimisation in rgblk_free
so that multiple block deallocations will now be more efficient,
and one clean up patch to use _RET_IP_ rather than writing it out longhand.

Abhi Das (1):
GFS2: fix bad inode i_goal values during block allocation

Bob Peterson (2):
GFS2: Make rename not save dirent location
GFS2: Use gfs2_rbm_incr in rgblk_free

Fabian Frederick (1):
GFS2: use _RET_IP_ instead of (unsigned long)__builtin_return_address(0)

fs/gfs2/dir.c | 9 +++++++--
fs/gfs2/dir.h | 1 +
fs/gfs2/glock.c | 4 ++--
fs/gfs2/glops.c | 2 +-
fs/gfs2/inode.c | 7 ++++---
fs/gfs2/rgrp.c | 30 +++++++++++++++++++++---------
fs/gfs2/rgrp.h | 1 +
fs/gfs2/trans.c | 2 +-
8 files changed, 38 insertions(+), 18 deletions(-)

Attachment: signature.asc
Description: This is a digitally signed message part