diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-10 11:02:22 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-10 11:02:22 -0700 |
| commit | 445e1ceda377a681c6f53595311b0d654ca21003 (patch) | |
| tree | f3298bd926e67d33944992a485a05374f592bef1 /fs/gfs2/mount.c | |
| parent | ef5bef357cdf49f3a386c7102dbf3be5f7e5c913 (diff) | |
| parent | 254db57f9b12daba841a4d91ddb9a8161e9c74ba (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw
* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw:
GFS2: Support for I/O barriers
GFS2: Add UUID to GFS2 sb
GFS2: high time to take some time over atime
GFS2: The war on bloat
GFS2: GFS2 will panic if you misspell any mount options
GFS2: Direct IO write at end of file error
GFS2: Use an IS_ERR test rather than a NULL test
GFS2: Fix race relating to glock min-hold time
GFS2: Fix & clean up GFS2 rename
GFS2: rm on multiple nodes causes panic
GFS2: Fix metafs mounts
GFS2: Fix debugfs glock file iterator
Diffstat (limited to 'fs/gfs2/mount.c')
| -rw-r--r-- | fs/gfs2/mount.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/fs/gfs2/mount.c b/fs/gfs2/mount.c index b941f9f9f95..df48333e6f0 100644 --- a/fs/gfs2/mount.c +++ b/fs/gfs2/mount.c @@ -42,6 +42,7 @@ enum { Opt_nosuiddir, Opt_data_writeback, Opt_data_ordered, + Opt_meta, Opt_err, }; @@ -66,6 +67,7 @@ static match_table_t tokens = { {Opt_nosuiddir, "nosuiddir"}, {Opt_data_writeback, "data=writeback"}, {Opt_data_ordered, "data=ordered"}, + {Opt_meta, "meta"}, {Opt_err, NULL} }; @@ -239,6 +241,11 @@ int gfs2_mount_args(struct gfs2_sbd *sdp, char *data_arg, int remount) case Opt_data_ordered: args->ar_data = GFS2_DATA_ORDERED; break; + case Opt_meta: + if (remount && args->ar_meta != 1) + goto cant_remount; + args->ar_meta = 1; + break; case Opt_err: default: fs_info(sdp, "unknown option: %s\n", o); |