Merge remote-tracking branch 'gfs2/master'

diff --cc fs/gfs2/aops.c
Simple merge

diff --cc fs/gfs2/file.c
Simple merge

diff --cc fs/gfs2/inode.c
Simple merge

diff --cc lib/lockref.c
Simple merge