diff options
author | Mark Brown <broonie@kernel.org> | 2014-11-22 11:15:34 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2014-11-22 12:51:05 +0000 |
commit | 28aa2be47924f6b971a6d323b3b4083228c8214f (patch) | |
tree | 0a8b1ee3d68f262338fb2e9e17badc3557f4f8c4 /fs/gfs2/meta_io.h | |
parent | a6b8ad1106ba7e875e1ea94657f19eb0636ce0b2 (diff) | |
parent | 1f0f80ecae848b0ca2ca632e94568721494f09f0 (diff) |
Merge branch 'linux-linaro-lsk-v3.14' into linux-linaro-lsk-v3.14-rtlsk-v3.14-rt-14.11
Conflicts:
include/linux/radix-tree.h
kernel/rcu/tree.c
mm/filemap.c
mm/page_alloc.c
Diffstat (limited to 'fs/gfs2/meta_io.h')
-rw-r--r-- | fs/gfs2/meta_io.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/gfs2/meta_io.h b/fs/gfs2/meta_io.h index 4823b934208a..ac5d8027d335 100644 --- a/fs/gfs2/meta_io.h +++ b/fs/gfs2/meta_io.h @@ -38,12 +38,15 @@ static inline void gfs2_buffer_copy_tail(struct buffer_head *to_bh, } extern const struct address_space_operations gfs2_meta_aops; +extern const struct address_space_operations gfs2_rgrp_aops; static inline struct gfs2_sbd *gfs2_mapping2sbd(struct address_space *mapping) { struct inode *inode = mapping->host; if (mapping->a_ops == &gfs2_meta_aops) return (((struct gfs2_glock *)mapping) - 1)->gl_sbd; + else if (mapping->a_ops == &gfs2_rgrp_aops) + return container_of(mapping, struct gfs2_sbd, sd_aspace); else return inode->i_sb->s_fs_info; } |