iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GFS2: Remove localcaching mount option

Browse Source 
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>
This commit is contained in:
Steven Whitehouse 2010-09-23 14:00:31 +01:00
parent f57a024ed2
commit c2048b003c
4 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/gfs2/dentry.c
View File

@ -49,7 +49,7 @@ static int gfs2_drevalidate(struct dentry *dentry, struct nameidata *nd)
ip = GFS2_I(inode); ip = GFS2_I(inode);
} }
if (sdp->sd_args.ar_localcaching) if (sdp->sd_lockstruct.ls_ops->lm_mount == NULL)
goto valid; goto valid;
had_lock = (gfs2_glock_is_locked_by_me(dip->i_gl) != NULL); had_lock = (gfs2_glock_is_locked_by_me(dip->i_gl) != NULL);

1
fs/gfs2/incore.h
View File

@ -417,7 +417,6 @@ struct gfs2_args {
char ar_hostdata[GFS2_LOCKNAME_LEN]; /* Host specific data */ char ar_hostdata[GFS2_LOCKNAME_LEN]; /* Host specific data */
unsigned int ar_spectator:1; /* Don't get a journal */ unsigned int ar_spectator:1; /* Don't get a journal */
unsigned int ar_localflocks:1; /* Let the VFS do flock|fcntl */ 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 */ unsigned int ar_debug:1; /* Oops on errors */
unsigned int ar_upgrade:1; /* Upgrade ondisk format */ unsigned int ar_upgrade:1; /* Upgrade ondisk format */
unsigned int ar_posix_acl:1; /* Enable posix acls */ unsigned int ar_posix_acl:1; /* Enable posix acls */

1
fs/gfs2/ops_fstype.c
View File

@ -1022,7 +1022,6 @@ static int gfs2_lm_mount(struct gfs2_sbd *sdp, int silent)
if (!strcmp("lock_nolock", proto)) { if (!strcmp("lock_nolock", proto)) {
lm = &nolock_ops; lm = &nolock_ops;
sdp->sd_args.ar_localflocks = 1; sdp->sd_args.ar_localflocks = 1;
sdp->sd_args.ar_localcaching = 1;
#ifdef CONFIG_GFS2_FS_LOCKING_DLM #ifdef CONFIG_GFS2_FS_LOCKING_DLM
} else if (!strcmp("lock_dlm", proto)) { } else if (!strcmp("lock_dlm", proto)) {
lm = &gfs2_dlm_ops; lm = &gfs2_dlm_ops;

5
fs/gfs2/super.c
View File

@ -165,7 +165,7 @@ int gfs2_mount_args(struct gfs2_args *args, char *options)
args->ar_localflocks = 1; args->ar_localflocks = 1;
break; break;
case Opt_localcaching: case Opt_localcaching:
args->ar_localcaching = 1; /* Retained for backwards compat only */
break; break;
case Opt_debug: case Opt_debug:
if (args->ar_errors == GFS2_ERRORS_PANIC) { if (args->ar_errors == GFS2_ERRORS_PANIC) {
@ -1129,7 +1129,6 @@ static int gfs2_remount_fs(struct super_block *sb, int *flags, char *data)
/* Some flags must not be changed */ /* Some flags must not be changed */
if (args_neq(&args, &sdp->sd_args, spectator) || if (args_neq(&args, &sdp->sd_args, spectator) ||
args_neq(&args, &sdp->sd_args, localflocks) || args_neq(&args, &sdp->sd_args, localflocks) ||
args_neq(&args, &sdp->sd_args, localcaching) ||
args_neq(&args, &sdp->sd_args, meta)) args_neq(&args, &sdp->sd_args, meta))
return -EINVAL; return -EINVAL;
@ -1234,8 +1233,6 @@ static int gfs2_show_options(struct seq_file *s, struct vfsmount *mnt)
seq_printf(s, ",spectator"); seq_printf(s, ",spectator");
if (args->ar_localflocks) if (args->ar_localflocks)
seq_printf(s, ",localflocks"); seq_printf(s, ",localflocks");
if (args->ar_localcaching)
seq_printf(s, ",localcaching");
if (args->ar_debug) if (args->ar_debug)
seq_printf(s, ",debug"); seq_printf(s, ",debug");
if (args->ar_upgrade) if (args->ar_upgrade)