From 36b948e480c785181b8dcc6c2e01aae1429b5491 Mon Sep 17 00:00:00 2001 From: Steven Whitehouse Date: Thu, 23 Sep 2010 13:41:42 +0100 Subject: [PATCH] --- yaml --- r: 211629 b: refs/heads/master c: f57a024ed2ee00d62515ffd4040f5ded3e0eb853 h: refs/heads/master i: 211627: c794a38059674846d99da0032147179efd9f12ad v: v3 --- [refs] | 2 +- trunk/fs/gfs2/incore.h | 1 - trunk/fs/gfs2/super.c | 5 +---- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 15db0e03585f..e573bd00582f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8d1235852b462cfb66aa036bd4a2686763c69ed4 +refs/heads/master: f57a024ed2ee00d62515ffd4040f5ded3e0eb853 diff --git a/trunk/fs/gfs2/incore.h b/trunk/fs/gfs2/incore.h index b12ca10481e7..c8a2db1bfe65 100644 --- a/trunk/fs/gfs2/incore.h +++ b/trunk/fs/gfs2/incore.h @@ -416,7 +416,6 @@ struct gfs2_args { char ar_locktable[GFS2_LOCKNAME_LEN]; /* Name of the Lock Table */ char ar_hostdata[GFS2_LOCKNAME_LEN]; /* Host specific data */ unsigned int ar_spectator:1; /* Don't get a journal */ - unsigned int ar_ignore_local_fs:1; /* Ignore optimisations */ unsigned int ar_localflocks:1; /* Let the VFS do flock|fcntl */ unsigned int ar_localcaching:1; /* Local caching */ unsigned int ar_debug:1; /* Oops on errors */ diff --git a/trunk/fs/gfs2/super.c b/trunk/fs/gfs2/super.c index e031fa4965a3..06a4a7e8cf7c 100644 --- a/trunk/fs/gfs2/super.c +++ b/trunk/fs/gfs2/super.c @@ -159,7 +159,7 @@ int gfs2_mount_args(struct gfs2_args *args, char *options) args->ar_spectator = 1; break; case Opt_ignore_local_fs: - args->ar_ignore_local_fs = 1; + /* Retained for backwards compat only */ break; case Opt_localflocks: args->ar_localflocks = 1; @@ -1128,7 +1128,6 @@ static int gfs2_remount_fs(struct super_block *sb, int *flags, char *data) /* Some flags must not be changed */ if (args_neq(&args, &sdp->sd_args, spectator) || - args_neq(&args, &sdp->sd_args, ignore_local_fs) || args_neq(&args, &sdp->sd_args, localflocks) || args_neq(&args, &sdp->sd_args, localcaching) || args_neq(&args, &sdp->sd_args, meta)) @@ -1233,8 +1232,6 @@ static int gfs2_show_options(struct seq_file *s, struct vfsmount *mnt) seq_printf(s, ",hostdata=%s", args->ar_hostdata); if (args->ar_spectator) seq_printf(s, ",spectator"); - if (args->ar_ignore_local_fs) - seq_printf(s, ",ignore_local_fs"); if (args->ar_localflocks) seq_printf(s, ",localflocks"); if (args->ar_localcaching)