Print this page
Kill flags arg in smbfs_purge_caches
Lots of comment cleanup
5404 smbfs needs mmap support
Portions contributed by: Gordon Ross <gordon.w.ross@gmail.com>
*** 66,79 ****
--- 66,83 ----
#include <vm/pvn.h>
#include <vm/seg.h>
#include <vm/seg_map.h>
#include <vm/seg_vn.h>
+ #define ATTRCACHE_VALID(vp) (gethrtime() < VTOSMB(vp)->r_attrtime)
+
static int smbfs_getattr_cache(vnode_t *, smbfattr_t *);
static void smbfattr_to_vattr(vnode_t *, smbfattr_t *, vattr_t *);
static void smbfattr_to_xvattr(smbfattr_t *, vattr_t *);
+ static int smbfs_getattr_otw(vnode_t *, struct smbfattr *, cred_t *);
+
/*
* The following code provide zone support in order to perform an action
* for each smbfs mount in a zone. This is also where we would add
* per-zone globals and kernel threads for the smbfs module (since
* they must be terminated by the shutdown callback).
*** 100,157 ****
* that have not changed for a long time. There are minimum and maximum
* timeout values that can be set per mount point.
*/
/*
! * Validate caches by checking cached attributes. If they have timed out
! * get the attributes from the server and compare mtimes. If mtimes are
! * different purge all caches for this vnode.
*/
int
smbfs_validate_caches(
struct vnode *vp,
cred_t *cr)
{
! struct vattr va;
! va.va_mask = AT_SIZE;
! return (smbfsgetattr(vp, &va, cr));
}
/*
* Purge all of the various data caches.
*/
! /*ARGSUSED*/
void
! smbfs_purge_caches(struct vnode *vp)
{
! #if 0 /* not yet: mmap support */
/*
! * NFS: Purge the DNLC for this vp,
* Clear any readdir state bits,
* the readlink response cache, ...
*/
- smbnode_t *np = VTOSMB(vp);
/*
* Flush the page cache.
*/
if (vn_has_cached_data(vp)) {
(void) VOP_PUTPAGE(vp, (u_offset_t)0, 0, B_INVAL, cr, NULL);
}
! #endif /* not yet */
}
/*
* Check the attribute cache to see if the new attributes match
* those cached. If they do, the various `data' caches are
* considered to be good. Otherwise, purge the cached data.
*/
! void
smbfs_cache_check(
struct vnode *vp,
! struct smbfattr *fap)
{
smbnode_t *np;
int purge_data = 0;
int purge_acl = 0;
--- 104,214 ----
* that have not changed for a long time. There are minimum and maximum
* timeout values that can be set per mount point.
*/
/*
! * Helper for _validate_caches
*/
int
+ smbfs_waitfor_purge_complete(vnode_t *vp)
+ {
+ smbnode_t *np;
+ k_sigset_t smask;
+
+ np = VTOSMB(vp);
+ if (np->r_serial != NULL && np->r_serial != curthread) {
+ mutex_enter(&np->r_statelock);
+ sigintr(&smask, VTOSMI(vp)->smi_flags & SMI_INT);
+ while (np->r_serial != NULL) {
+ if (!cv_wait_sig(&np->r_cv, &np->r_statelock)) {
+ sigunintr(&smask);
+ mutex_exit(&np->r_statelock);
+ return (EINTR);
+ }
+ }
+ sigunintr(&smask);
+ mutex_exit(&np->r_statelock);
+ }
+ return (0);
+ }
+
+ /*
+ * Validate caches by checking cached attributes. If the cached
+ * attributes have timed out, then get new attributes from the server.
+ * As a side affect, this will do cache invalidation if the attributes
+ * have changed.
+ *
+ * If the attributes have not timed out and if there is a cache
+ * invalidation being done by some other thread, then wait until that
+ * thread has completed the cache invalidation.
+ */
+ int
smbfs_validate_caches(
struct vnode *vp,
cred_t *cr)
{
! struct smbfattr fa;
! int error;
! if (ATTRCACHE_VALID(vp)) {
! error = smbfs_waitfor_purge_complete(vp);
! if (error)
! return (error);
! return (0);
! }
!
! return (smbfs_getattr_otw(vp, &fa, cr));
}
/*
* Purge all of the various data caches.
+ *
+ * Here NFS also had a flags arg to control what gets flushed.
+ * We only have the page cache, so no flags arg.
*/
! /* ARGSUSED */
void
! smbfs_purge_caches(struct vnode *vp, cred_t *cr)
{
!
/*
! * Here NFS has: Purge the DNLC for this vp,
* Clear any readdir state bits,
* the readlink response cache, ...
*/
/*
* Flush the page cache.
*/
if (vn_has_cached_data(vp)) {
(void) VOP_PUTPAGE(vp, (u_offset_t)0, 0, B_INVAL, cr, NULL);
}
!
! /*
! * Here NFS has: Flush the readdir response cache.
! * No readdir cache in smbfs.
! */
}
/*
+ * Here NFS has:
+ * nfs_purge_rddir_cache()
+ * nfs3_cache_post_op_attr()
+ * nfs3_cache_post_op_vattr()
+ * nfs3_cache_wcc_data()
+ */
+
+ /*
* Check the attribute cache to see if the new attributes match
* those cached. If they do, the various `data' caches are
* considered to be good. Otherwise, purge the cached data.
*/
! static void
smbfs_cache_check(
struct vnode *vp,
! struct smbfattr *fap,
! cred_t *cr)
{
smbnode_t *np;
int purge_data = 0;
int purge_acl = 0;
*** 172,212 ****
if (np->r_attr.fa_ctime.tv_sec != fap->fa_ctime.tv_sec ||
np->r_attr.fa_ctime.tv_nsec != fap->fa_ctime.tv_nsec)
purge_acl = 1;
if (purge_acl) {
- /* just invalidate r_secattr (XXX: OK?) */
np->r_sectime = gethrtime();
}
mutex_exit(&np->r_statelock);
if (purge_data)
! smbfs_purge_caches(vp);
}
/*
- * Set attributes cache for given vnode using vnode attributes.
- * From NFS: nfs_attrcache_va
- */
- #if 0 /* not yet (not sure if we need this) */
- void
- smbfs_attrcache_va(vnode_t *vp, struct vattr *vap)
- {
- smbfattr_t fa;
- smbnode_t *np;
-
- vattr_to_fattr(vp, vap, &fa);
- smbfs_attrcache_fa(vp, &fa);
- }
- #endif /* not yet */
-
- /*
* Set attributes cache for given vnode using SMB fattr
* and update the attribute cache timeout.
*
! * From NFS: nfs_attrcache, nfs_attrcache_va
*/
void
smbfs_attrcache_fa(vnode_t *vp, struct smbfattr *fap)
{
smbnode_t *np;
--- 229,252 ----
if (np->r_attr.fa_ctime.tv_sec != fap->fa_ctime.tv_sec ||
np->r_attr.fa_ctime.tv_nsec != fap->fa_ctime.tv_nsec)
purge_acl = 1;
if (purge_acl) {
np->r_sectime = gethrtime();
}
mutex_exit(&np->r_statelock);
if (purge_data)
! smbfs_purge_caches(vp, cr);
}
/*
* Set attributes cache for given vnode using SMB fattr
* and update the attribute cache timeout.
*
! * Based on NFS: nfs_attrcache, nfs_attrcache_va
*/
void
smbfs_attrcache_fa(vnode_t *vp, struct smbfattr *fap)
{
smbnode_t *np;
*** 291,312 ****
*/
newsize = fap->fa_size;
if (vtype == VDIR && newsize < DEV_BSIZE)
newsize = DEV_BSIZE;
! if (np->r_size != newsize) {
! #if 0 /* not yet: mmap support */
! if (!vn_has_cached_data(vp) || ...)
! /* XXX: See NFS page cache code. */
! #endif /* not yet */
/* OK to set the size. */
np->r_size = newsize;
}
! /* NFS: np->r_flags &= ~RWRITEATTR; */
! np->n_flag &= ~NATTRCHANGED;
mutex_exit(&np->r_statelock);
if (oldvt != vtype) {
SMBVDEBUG("vtype change %d to %d\n", oldvt, vtype);
}
--- 331,355 ----
*/
newsize = fap->fa_size;
if (vtype == VDIR && newsize < DEV_BSIZE)
newsize = DEV_BSIZE;
! if (np->r_size != newsize &&
! (!vn_has_cached_data(vp) ||
! (!(np->r_flags & RDIRTY) && np->r_count == 0))) {
/* OK to set the size. */
np->r_size = newsize;
}
! /*
! * Here NFS has:
! * nfs_setswaplike(vp, va);
! * np->r_flags &= ~RWRITEATTR;
! * (not needed here)
! */
+ np->n_flag &= ~NATTRCHANGED;
mutex_exit(&np->r_statelock);
if (oldvt != vtype) {
SMBVDEBUG("vtype change %d to %d\n", oldvt, vtype);
}
*** 346,366 ****
* Get attributes over-the-wire and update attributes cache
* if no error occurred in the over-the-wire operation.
* Return 0 if successful, otherwise error.
* From NFS: nfs_getattr_otw
*/
! int
smbfs_getattr_otw(vnode_t *vp, struct smbfattr *fap, cred_t *cr)
{
struct smbnode *np;
struct smb_cred scred;
int error;
np = VTOSMB(vp);
/*
! * NFS uses the ACL rpc here (if smi_flags & SMI_ACL)
* With SMB, getting the ACL is a significantly more
* expensive operation, so we do that only when asked
* for the uid/gid. See smbfsgetattr().
*/
--- 389,409 ----
* Get attributes over-the-wire and update attributes cache
* if no error occurred in the over-the-wire operation.
* Return 0 if successful, otherwise error.
* From NFS: nfs_getattr_otw
*/
! static int
smbfs_getattr_otw(vnode_t *vp, struct smbfattr *fap, cred_t *cr)
{
struct smbnode *np;
struct smb_cred scred;
int error;
np = VTOSMB(vp);
/*
! * Here NFS uses the ACL RPC (if smi_flags & SMI_ACL)
* With SMB, getting the ACL is a significantly more
* expensive operation, so we do that only when asked
* for the uid/gid. See smbfsgetattr().
*/
*** 374,384 ****
smb_credrele(&scred);
smbfs_rw_exit(&np->r_lkserlock);
if (error) {
! /* NFS had: PURGE_STALE_FH(error, vp, cr) */
smbfs_attrcache_remove(np);
if (error == ENOENT || error == ENOTDIR) {
/*
* Getattr failed because the object was
* removed or renamed by another client.
--- 417,427 ----
smb_credrele(&scred);
smbfs_rw_exit(&np->r_lkserlock);
if (error) {
! /* Here NFS has: PURGE_STALE_FH(error, vp, cr) */
smbfs_attrcache_remove(np);
if (error == ENOENT || error == ENOTDIR) {
/*
* Getattr failed because the object was
* removed or renamed by another client.
*** 388,410 ****
}
return (error);
}
/*
! * NFS: smbfs_cache_fattr(vap, fa, vap, t, cr);
* which did: fattr_to_vattr, nfs_attr_cache.
* We cache the fattr form, so just do the
* cache check and store the attributes.
*/
! smbfs_cache_check(vp, fap);
smbfs_attrcache_fa(vp, fap);
return (0);
}
/*
! * Return either cached or remote attributes. If get remote attr
* use them to check and invalidate caches, then cache the new attributes.
*
* From NFS: nfsgetattr()
*/
int
--- 431,453 ----
}
return (error);
}
/*
! * Here NFS has: nfs_cache_fattr(vap, fa, vap, t, cr);
* which did: fattr_to_vattr, nfs_attr_cache.
* We cache the fattr form, so just do the
* cache check and store the attributes.
*/
! smbfs_cache_check(vp, fap, cr);
smbfs_attrcache_fa(vp, fap);
return (0);
}
/*
! * Return either cached or remote attributes. If we get remote attrs,
* use them to check and invalidate caches, then cache the new attributes.
*
* From NFS: nfsgetattr()
*/
int
*** 547,556 ****
--- 590,668 ----
xoap->xoa_hidden =
((fa->fa_attr & SMB_FA_HIDDEN) != 0);
XVA_SET_RTN(xvap, XAT_HIDDEN);
}
}
+
+ /*
+ * Here NFS has:
+ * nfs_async_... stuff
+ * which we're not using (no async I/O), and:
+ * writerp(),
+ * nfs_putpages()
+ * nfs_invalidate_pages()
+ * which we have in smbfs_vnops.c, and
+ * nfs_printfhandle()
+ * nfs_write_error()
+ * not needed here.
+ */
+
+ /*
+ * Helper function for smbfs_sync
+ *
+ * Walk the per-zone list of smbfs mounts, calling smbfs_rflush
+ * on each one. This is a little tricky because we need to exit
+ * the list mutex before each _rflush call and then try to resume
+ * where we were in the list after re-entering the mutex.
+ */
+ void
+ smbfs_flushall(cred_t *cr)
+ {
+ smi_globals_t *smg;
+ smbmntinfo_t *tmp_smi, *cur_smi, *next_smi;
+
+ smg = zone_getspecific(smi_list_key, crgetzone(cr));
+ ASSERT(smg != NULL);
+
+ mutex_enter(&smg->smg_lock);
+ cur_smi = list_head(&smg->smg_list);
+ if (cur_smi == NULL) {
+ mutex_exit(&smg->smg_lock);
+ return;
+ }
+ VFS_HOLD(cur_smi->smi_vfsp);
+ mutex_exit(&smg->smg_lock);
+
+ flush:
+ smbfs_rflush(cur_smi->smi_vfsp, cr);
+
+ mutex_enter(&smg->smg_lock);
+ /*
+ * Resume after cur_smi if that's still on the list,
+ * otherwise restart at the head.
+ */
+ for (tmp_smi = list_head(&smg->smg_list);
+ tmp_smi != NULL;
+ tmp_smi = list_next(&smg->smg_list, tmp_smi))
+ if (tmp_smi == cur_smi)
+ break;
+ if (tmp_smi != NULL)
+ next_smi = list_next(&smg->smg_list, tmp_smi);
+ else
+ next_smi = list_head(&smg->smg_list);
+
+ if (next_smi != NULL)
+ VFS_HOLD(next_smi->smi_vfsp);
+ VFS_RELE(cur_smi->smi_vfsp);
+
+ mutex_exit(&smg->smg_lock);
+
+ if (next_smi != NULL) {
+ cur_smi = next_smi;
+ goto flush;
+ }
+ }
/*
* SMB Client initialization and cleanup.
* Much of it is per-zone now.
*/