f55073ff1e
We have a long term plan to use the "-o meta" flag to GFS2 mounts to access the alternate root which is used to store metadata for a GFS2 filesystem. This will allow us to eventually remove support for the gfs2meta filesystem type (which is in any case just a "front end" to the gfs2 filesystem type with the meta/master root). Currently the "-o meta" option is only taken into account on the initial mount of the filesystem. Subsequent mounts of the same filesystem (i.e. on the same device) result in basically the same as bind mounting the root of the original mount. This patch changes that by using what is more or less a copy of get_sb_bdev() and extending it so that it will take into account the alternate root in all cases. The main difference is that we have to parse the mount options a bit earlier. We can then use them to select the appropriate root towards the end of the function. In addition this also fixes a bug where it was possible (but certainly not desirable) to set different ro/rw options for the meta root when mounted via the gfs2meta fs compared with the original mount. Signed-off-by: Steven Whitehouse <swhiteho@redhat.com> Cc: Alexander Viro <aviro@redhat.com>
61 lines
2.0 KiB
C
61 lines
2.0 KiB
C
/*
|
|
* Copyright (C) Sistina Software, Inc. 1997-2003 All rights reserved.
|
|
* Copyright (C) 2004-2006 Red Hat, Inc. All rights reserved.
|
|
*
|
|
* This copyrighted material is made available to anyone wishing to use,
|
|
* modify, copy, or redistribute it subject to the terms and conditions
|
|
* of the GNU General Public License version 2.
|
|
*/
|
|
|
|
#ifndef __SUPER_DOT_H__
|
|
#define __SUPER_DOT_H__
|
|
|
|
#include <linux/fs.h>
|
|
#include <linux/dcache.h>
|
|
#include "incore.h"
|
|
|
|
extern void gfs2_lm_unmount(struct gfs2_sbd *sdp);
|
|
|
|
static inline unsigned int gfs2_jindex_size(struct gfs2_sbd *sdp)
|
|
{
|
|
unsigned int x;
|
|
spin_lock(&sdp->sd_jindex_spin);
|
|
x = sdp->sd_journals;
|
|
spin_unlock(&sdp->sd_jindex_spin);
|
|
return x;
|
|
}
|
|
|
|
extern void gfs2_jindex_free(struct gfs2_sbd *sdp);
|
|
|
|
extern int gfs2_mount_args(struct gfs2_args *args, char *data);
|
|
|
|
extern struct gfs2_jdesc *gfs2_jdesc_find(struct gfs2_sbd *sdp, unsigned int jid);
|
|
extern int gfs2_jdesc_check(struct gfs2_jdesc *jd);
|
|
|
|
extern int gfs2_lookup_in_master_dir(struct gfs2_sbd *sdp, char *filename,
|
|
struct gfs2_inode **ipp);
|
|
|
|
extern int gfs2_make_fs_rw(struct gfs2_sbd *sdp);
|
|
extern void gfs2_online_uevent(struct gfs2_sbd *sdp);
|
|
extern int gfs2_statfs_init(struct gfs2_sbd *sdp);
|
|
extern void gfs2_statfs_change(struct gfs2_sbd *sdp, s64 total, s64 free,
|
|
s64 dinodes);
|
|
extern void gfs2_statfs_change_in(struct gfs2_statfs_change_host *sc,
|
|
const void *buf);
|
|
extern void update_statfs(struct gfs2_sbd *sdp, struct buffer_head *m_bh,
|
|
struct buffer_head *l_bh);
|
|
extern int gfs2_statfs_sync(struct gfs2_sbd *sdp);
|
|
|
|
extern int gfs2_freeze_fs(struct gfs2_sbd *sdp);
|
|
extern void gfs2_unfreeze_fs(struct gfs2_sbd *sdp);
|
|
|
|
extern struct file_system_type gfs2_fs_type;
|
|
extern struct file_system_type gfs2meta_fs_type;
|
|
extern const struct export_operations gfs2_export_ops;
|
|
extern const struct super_operations gfs2_super_ops;
|
|
extern const struct dentry_operations gfs2_dops;
|
|
extern struct xattr_handler *gfs2_xattr_handlers[];
|
|
|
|
#endif /* __SUPER_DOT_H__ */
|
|
|