aboutsummaryrefslogtreecommitdiffstats
path: root/fs/gfs2/super.c
diff options
context:
space:
mode:
authorSteven Whitehouse <swhiteho@redhat.com>2010-09-23 09:00:31 -0400
committerSteven Whitehouse <swhiteho@redhat.com>2010-09-23 09:00:31 -0400
commitc2048b003cfb840ad81bdc6eb55beb12a19a222e (patch)
tree17b3b09141cfb1c2ca13759bac365ef5050e5dc9 /fs/gfs2/super.c
parentf57a024ed2ee00d62515ffd4040f5ded3e0eb853 (diff)
GFS2: Remove localcaching mount option
This option defaulted to on for lock_nolock mounts and off otherwise. The only function was to avoid the revalidation of dentries. In the cluster case, that is entirely pointless and liable to cause coherency problems. The patch changes the revalidation to depend upon whether the fs is a local or cluster fs (i.e. it follows the existing default behaviour). I very much doubt anybody ever used this option as there is no reason to. Even so we will continue to accept it on the mount command line, but ignore it. Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/gfs2/super.c')
-rw-r--r--fs/gfs2/super.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c
index 06a4a7e8cf7c..e78de8bf2728 100644
--- a/fs/gfs2/super.c
+++ b/fs/gfs2/super.c
@@ -165,7 +165,7 @@ int gfs2_mount_args(struct gfs2_args *args, char *options)
165 args->ar_localflocks = 1; 165 args->ar_localflocks = 1;
166 break; 166 break;
167 case Opt_localcaching: 167 case Opt_localcaching:
168 args->ar_localcaching = 1; 168 /* Retained for backwards compat only */
169 break; 169 break;
170 case Opt_debug: 170 case Opt_debug:
171 if (args->ar_errors == GFS2_ERRORS_PANIC) { 171 if (args->ar_errors == GFS2_ERRORS_PANIC) {
@@ -1129,7 +1129,6 @@ static int gfs2_remount_fs(struct super_block *sb, int *flags, char *data)
1129 /* Some flags must not be changed */ 1129 /* Some flags must not be changed */
1130 if (args_neq(&args, &sdp->sd_args, spectator) || 1130 if (args_neq(&args, &sdp->sd_args, spectator) ||
1131 args_neq(&args, &sdp->sd_args, localflocks) || 1131 args_neq(&args, &sdp->sd_args, localflocks) ||
1132 args_neq(&args, &sdp->sd_args, localcaching) ||
1133 args_neq(&args, &sdp->sd_args, meta)) 1132 args_neq(&args, &sdp->sd_args, meta))
1134 return -EINVAL; 1133 return -EINVAL;
1135 1134
@@ -1234,8 +1233,6 @@ static int gfs2_show_options(struct seq_file *s, struct vfsmount *mnt)
1234 seq_printf(s, ",spectator"); 1233 seq_printf(s, ",spectator");
1235 if (args->ar_localflocks) 1234 if (args->ar_localflocks)
1236 seq_printf(s, ",localflocks"); 1235 seq_printf(s, ",localflocks");
1237 if (args->ar_localcaching)
1238 seq_printf(s, ",localcaching");
1239 if (args->ar_debug) 1236 if (args->ar_debug)
1240 seq_printf(s, ",debug"); 1237 seq_printf(s, ",debug");
1241 if (args->ar_upgrade) 1238 if (args->ar_upgrade)