Merge branch 'gfs2-iopen' into for-next

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

diff --cc fs/gfs2/glock.h
Simple merge

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

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