/*
- * Copyright (c) 1989, 1991 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1989, 1991, 1993, 1994
+ * The Regents of the University of California. All rights reserved.
*
* %sccs.include.redist.c%
*
- * @(#)lfs_vfsops.c 7.73 (Berkeley) %G%
+ * @(#)lfs_vfsops.c 8.11 (Berkeley) %G%
*/
#include <sys/param.h>
#include <sys/proc.h>
#include <sys/kernel.h>
#include <sys/vnode.h>
-#include <sys/specdev.h>
#include <sys/mount.h>
#include <sys/buf.h>
+#include <sys/mbuf.h>
#include <sys/file.h>
#include <sys/disklabel.h>
#include <sys/ioctl.h>
#include <sys/errno.h>
#include <sys/malloc.h>
+#include <sys/socket.h>
+
+#include <miscfs/specfs/specdev.h>
#include "ioctl.h"
#include "disklabel.h"
#include "stat.h"
lfs_mount,
ufs_start,
lfs_unmount,
- lfs_root,
+ ufs_root,
ufs_quotactl,
lfs_statfs,
lfs_sync,
+ lfs_vget,
lfs_fhtovp,
lfs_vptofh,
lfs_init,
register struct lfs *fs; /* LFS */
u_int size;
int error;
+ mode_t accessmode;
if (error = copyin(data, (caddr_t)&args, sizeof (struct ufs_args)))
return (error);
/* Until LFS can do NFS right. XXX */
- if (args.exflags & MNT_EXPORTED)
+ if (args.export.ex_flags & MNT_EXPORTED)
return (EINVAL);
+
/*
* If updating, check whether changing from read-only to
* read/write; if there is no device name, that's all we do.
*/
if (mp->mnt_flag & MNT_UPDATE) {
ump = VFSTOUFS(mp);
-#ifdef NOTLFS /* LFS */
- fs = ump->um_fs;
- if (fs->fs_ronly && (mp->mnt_flag & MNT_RDONLY) == 0)
- fs->fs_ronly = 0;
-#else
- fs = ump->um_lfs;
- if (fs->lfs_ronly && (mp->mnt_flag & MNT_RDONLY) == 0)
+ if (fs->lfs_ronly && (mp->mnt_flag & MNT_WANTRDWR)) {
+ /*
+ * If upgrade to read-write by non-root, then verify
+ * that user has necessary permissions on the device.
+ */
+ if (p->p_ucred->cr_uid != 0) {
+ VOP_LOCK(ump->um_devvp);
+ if (error = VOP_ACCESS(ump->um_devvp,
+ VREAD | VWRITE, p->p_ucred, p)) {
+ VOP_UNLOCK(ump->um_devvp);
+ return (error);
+ }
+ VOP_UNLOCK(ump->um_devvp);
+ }
fs->lfs_ronly = 0;
-#endif
+ }
if (args.fspec == 0) {
/*
* Process export requests.
*/
- if (args.exflags & MNT_EXPORTED) {
- if (error = hang_addrlist(mp, &args))
- return (error);
- mp->mnt_flag |= MNT_EXPORTED;
- }
- if (args.exflags & MNT_DELEXPORT) {
- free_addrlist(ump);
- mp->mnt_flag &=
- ~(MNT_EXPORTED | MNT_DEFEXPORTED);
- }
- return (0);
+ return (vfs_export(mp, &ump->um_export, &args.export));
}
}
/*
vrele(devvp);
return (ENXIO);
}
+ /*
+ * If mount by non-root, then verify that user has necessary
+ * permissions on the device.
+ */
+ if (p->p_ucred->cr_uid != 0) {
+ accessmode = VREAD;
+ if ((mp->mnt_flag & MNT_RDONLY) == 0)
+ accessmode |= VWRITE;
+ VOP_LOCK(devvp);
+ if (error = VOP_ACCESS(devvp, accessmode, p->p_ucred, p)) {
+ vput(devvp);
+ return (error);
+ }
+ VOP_UNLOCK(devvp);
+ }
if ((mp->mnt_flag & MNT_UPDATE) == 0)
error = lfs_mountfs(devvp, mp, p); /* LFS */
else {
struct partinfo dpart;
dev_t dev;
int error, i, ronly, size;
+ struct ucred *cred;
- if (error = VOP_OPEN(devvp, ronly ? FREAD : FREAD|FWRITE, NOCRED, p))
+ cred = p ? p->p_ucred : NOCRED;
+ if (error = VOP_OPEN(devvp, ronly ? FREAD : FREAD|FWRITE, FSCRED, p))
return (error);
- if (VOP_IOCTL(devvp, DIOCGPART, (caddr_t)&dpart, FREAD, NOCRED, p) != 0)
+ if (VOP_IOCTL(devvp, DIOCGPART, (caddr_t)&dpart, FREAD, cred, p) != 0)
size = DEV_BSIZE;
else {
size = dpart.disklab->d_secsize;
ump = NULL;
/* Read in the superblock. */
- if (error = bread(devvp, LFS_LABELPAD / size, LFS_SBPAD, NOCRED, &bp))
+ if (error = bread(devvp, LFS_LABELPAD / size, LFS_SBPAD, cred, &bp))
goto out;
error = EINVAL; /* XXX needs translation */
goto out;
}
-#ifdef DEBUG
- lfs_dump_super(fs);
-#endif
/* Allocate the mount structure, copy the superblock into it. */
ump = (struct ufsmount *)malloc(sizeof *ump, M_UFSMNT, M_WAITOK);
- ump->um_lfs = malloc(sizeof(struct lfs), M_UFSMNT, M_WAITOK);
- bcopy(bp->b_un.b_addr, ump->um_lfs, sizeof(struct lfs));
+ fs = ump->um_lfs = malloc(sizeof(struct lfs), M_UFSMNT, M_WAITOK);
+ bcopy(bp->b_data, fs, sizeof(struct lfs));
if (sizeof(struct lfs) < LFS_SBPAD) /* XXX why? */
bp->b_flags |= B_INVAL;
brelse(bp);
/* Set up the I/O information */
fs->lfs_iocount = 0;
+ /* Set up the ifile and lock aflags */
+ fs->lfs_doifile = 0;
+ fs->lfs_writer = 0;
+ fs->lfs_dirops = 0;
+ fs->lfs_seglock = 0;
+
/* Set the file system readonly/modify bits. */
- fs = ump->um_lfs;
fs->lfs_ronly = ronly;
if (ronly == 0)
fs->lfs_fmod = 1;
mp->mnt_data = (qaddr_t)ump;
mp->mnt_stat.f_fsid.val[0] = (long)dev;
mp->mnt_stat.f_fsid.val[1] = MOUNT_LFS;
+ mp->mnt_maxsymlinklen = fs->lfs_maxsymlinklen;
mp->mnt_flag |= MNT_LOCAL;
ump->um_mountp = mp;
ump->um_dev = dev;
ump->um_devvp = devvp;
+ ump->um_bptrtodb = 0;
+ ump->um_seqinc = 1 << fs->lfs_fsbtodb;
+ ump->um_nindir = fs->lfs_nindir;
for (i = 0; i < MAXQUOTAS; i++)
ump->um_quotas[i] = NULLVP;
devvp->v_specflags |= SI_MOUNTEDON;
* artificially increment the reference count and keep a pointer
* to it in the incore copy of the superblock.
*/
- if (error = lfs_vget(mp, LFS_IFILE_INUM, &vp))
+ if (error = VFS_VGET(mp, LFS_IFILE_INUM, &vp))
goto out;
fs->lfs_ivnode = vp;
VREF(vp);
out:
if (bp)
brelse(bp);
- (void)VOP_CLOSE(devvp, ronly ? FREAD : FREAD|FWRITE, NOCRED, p);
+ (void)VOP_CLOSE(devvp, ronly ? FREAD : FREAD|FWRITE, cred, p);
if (ump) {
free(ump->um_lfs, M_UFSMNT);
free(ump, M_UFSMNT);
{
extern int doforce;
register struct ufsmount *ump;
- register struct lfs *fs; /* LFS */
- int i, error, ronly, flags = 0;
- int ndirty; /* LFS */
+ register struct lfs *fs;
+ int i, error, flags, ronly;
-#ifdef VERBOSE
- printf("lfs_unmount\n");
-#endif
+ flags = 0;
if (mntflags & MNT_FORCE) {
- if (!doforce || mp == rootfs)
+ if (!doforce || (mp->mnt_flag & MNT_ROOTFS))
return (EINVAL);
flags |= FORCECLOSE;
}
- if (error = lfs_segwrite(mp, 1))
- return(error);
-
-ndirty = lfs_umountdebug(mp);
-printf("lfs_umountdebug: returned %d dirty\n", ndirty);
-return(0);
- if (mntinvalbuf(mp))
- return (EBUSY);
+
ump = VFSTOUFS(mp);
+ fs = ump->um_lfs;
return (error);
#ifdef QUOTA
if (mp->mnt_flag & MNT_QUOTA) {
- if (error = vflush(mp, NULLVP, SKIPSYSTEM|flags))
+ if (error = vflush(mp, fs->lfs_ivnode, SKIPSYSTEM|flags))
return (error);
for (i = 0; i < MAXQUOTAS; i++) {
if (ump->um_quotas[i] == NULLVP)
*/
}
#endif
- if (error = vflush(mp, NULLVP, flags))
+ if (error = vflush(mp, fs->lfs_ivnode, flags))
return (error);
- fs = ump->um_lfs;
- ronly = !fs->lfs_ronly;
+ fs->lfs_clean = 1;
+ if (error = VFS_SYNC(mp, 1, p->p_ucred, p))
+ return (error);
+ if (fs->lfs_ivnode->v_dirtyblkhd.lh_first)
+ panic("lfs_unmount: still dirty blocks on ifile vnode\n");
vrele(fs->lfs_ivnode);
+ vgone(fs->lfs_ivnode);
+
+ ronly = !fs->lfs_ronly;
* Get file system statistics.
*/
lfs_statfs(mp, sbp, p)
sbp->f_type = MOUNT_LFS;
sbp->f_bsize = fs->lfs_bsize;
sbp->f_iosize = fs->lfs_bsize;
- sbp->f_blocks = fs->lfs_dsize;
- sbp->f_bfree = fs->lfs_bfree;
+ sbp->f_blocks = dbtofsb(fs,fs->lfs_dsize);
+ sbp->f_bfree = dbtofsb(fs, fs->lfs_bfree);
sbp->f_bavail = (fs->lfs_dsize * (100 - fs->lfs_minfree) / 100) -
- (fs->lfs_dsize - sbp->f_bfree);
+ (fs->lfs_dsize - fs->lfs_bfree);
+ sbp->f_bavail = dbtofsb(fs, sbp->f_bavail);
sbp->f_files = fs->lfs_nfiles;
- sbp->f_ffree = fs->lfs_bfree * INOPB(fs);
+ sbp->f_ffree = sbp->f_bfree * INOPB(fs);
if (sbp != &mp->mnt_stat) {
bcopy((caddr_t)mp->mnt_stat.f_mntonname,
(caddr_t)&sbp->f_mntonname[0], MNAMELEN);
*
* Note: we are always called with the filesystem marked `MPBUSY'.
*/
-lfs_sync(mp, waitfor)
+lfs_sync(mp, waitfor, cred, p)
struct mount *mp;
int waitfor;
+ struct ucred *cred;
+ struct proc *p;
{
- extern int crashandburn, syncprt;
int error;
-#ifdef VERBOSE
- printf("lfs_sync\n");
-#endif
-
-#ifdef DIAGNOSTIC
- if (crashandburn)
- return (0);
-#endif
- if (syncprt)
- ufs_bufstats();
-
/* All syncs must be checkpoints until roll-forward is implemented. */
- error = lfs_segwrite(mp, 1);
+ error = lfs_segwrite(mp, SEGM_CKP | (waitfor ? SEGM_SYNC : 0));
#ifdef QUOTA
qsync(mp);
#endif
return (error);
}
+/*
+ * Look up an LFS dinode number to find its incore vnode. If not already
+ * in core, read it in from the specified device. Return the inode locked.
+ * Detection and handling of mount points must be done by the calling routine.
+ */
+int
+lfs_vget(mp, ino, vpp)
+ struct mount *mp;
+ ino_t ino;
+ struct vnode **vpp;
+{
+ register struct lfs *fs;
+ register struct inode *ip;
+ struct buf *bp;
+ struct ifile *ifp;
+ struct vnode *vp;
+ struct ufsmount *ump;
+ ufs_daddr_t daddr;
+ dev_t dev;
+ int error;
+
+ ump = VFSTOUFS(mp);
+ dev = ump->um_dev;
+ if ((*vpp = ufs_ihashget(dev, ino)) != NULL)
+ return (0);
+
+ /* Translate the inode number to a disk address. */
+ fs = ump->um_lfs;
+ if (ino == LFS_IFILE_INUM)
+ daddr = fs->lfs_idaddr;
+ else {
+ LFS_IENTRY(ifp, fs, ino, bp);
+ daddr = ifp->if_daddr;
+ brelse(bp);
+ if (daddr == LFS_UNUSED_DADDR)
+ return (ENOENT);
+ }
+
+ /* Allocate new vnode/inode. */
+ if (error = lfs_vcreate(mp, ino, &vp)) {
+ *vpp = NULL;
+ return (error);
+ }
+
+ /*
+ * Put it onto its hash chain and lock it so that other requests for
+ * this inode will block if they arrive while we are sleeping waiting
+ * for old data structures to be purged or for the contents of the
+ * disk portion of this inode to be read.
+ */
+ ip = VTOI(vp);
+ ufs_ihashins(ip);
+
+ /*
+ * XXX
+ * This may not need to be here, logically it should go down with
+ * the i_devvp initialization.
+ * Ask Kirk.
+ */
+ ip->i_lfs = ump->um_lfs;
+
+ /* Read in the disk contents for the inode, copy into the inode. */
+ if (error =
+ bread(ump->um_devvp, daddr, (int)fs->lfs_bsize, NOCRED, &bp)) {
+ /*
+ * The inode does not contain anything useful, so it would
+ * be misleading to leave it on its hash chain. With mode
+ * still zero, it will be unlinked and returned to the free
+ * list by vput().
+ */
+ vput(vp);
+ brelse(bp);
+ *vpp = NULL;
+ return (error);
+ }
+ ip->i_din = *lfs_ifind(fs, ino, (struct dinode *)bp->b_data);
+ brelse(bp);
+
+ /*
+ * Initialize the vnode from the inode, check for aliases. In all
+ * cases re-init ip, the underlying vnode/inode may have changed.
+ */
+ if (error = ufs_vinit(mp, lfs_specop_p, LFS_FIFOOPS, &vp)) {
+ vput(vp);
+ *vpp = NULL;
+ return (error);
+ }
+ /*
+ * Finish inode initialization now that aliasing has been resolved.
+ */
+ ip->i_devvp = ump->um_devvp;
+ VREF(ip->i_devvp);
+ *vpp = vp;
+ return (0);
+}
+
/*
* File handle to vnode
*
* - check that the inode number is valid
* - call lfs_vget() to get the locked inode
* - check for an unallocated inode (i_mode == 0)
- * - check that the generation number matches
+ * - check that the given client host has export rights and return
+ * those rights via. exflagsp and credanonp
*
* XXX
* use ifile to see if inode is allocated instead of reading off disk
* generational number.
*/
int
-lfs_fhtovp(mp, fhp, setgen, vpp)
+lfs_fhtovp(mp, fhp, nam, vpp, exflagsp, credanonp)
register struct mount *mp;
struct fid *fhp;
- int setgen;
+ struct mbuf *nam;
struct vnode **vpp;
+ int *exflagsp;
+ struct ucred **credanonp;
{
- register struct inode *ip;
register struct ufid *ufhp;
- struct vnode *nvp;
- int error;
ufhp = (struct ufid *)fhp;
if (ufhp->ufid_ino < ROOTINO)
- return (EINVAL);
- if (error = lfs_vget(mp, ufhp->ufid_ino, &nvp)) {
- *vpp = NULLVP;
- return (error);
- }
- ip = VTOI(nvp);
- if (ip->i_mode == 0) {
- ufs_iput(ip);
- *vpp = NULLVP;
- return (EINVAL);
- }
- if (ip->i_gen != ufhp->ufid_gen) {
- if (setgen)
- ufhp->ufid_gen = ip->i_gen;
- else {
- ufs_iput(ip);
- *vpp = NULLVP;
- return (EINVAL);
- }
- }
- *vpp = nvp;
- return (0);
+ return (ESTALE);
+ return (ufs_check_export(mp, ufhp, nam, vpp, exflagsp, credanonp));
}
/*