diff options
Diffstat (limited to 'fatfs')
| -rw-r--r-- | fatfs/ChangeLog | 18 | ||||
| -rw-r--r-- | fatfs/Makefile | 4 | ||||
| -rw-r--r-- | fatfs/dir.c | 77 | ||||
| -rw-r--r-- | fatfs/fat.c | 20 | ||||
| -rw-r--r-- | fatfs/main.c | 2 | ||||
| -rw-r--r-- | fatfs/node-create.c | 204 |
6 files changed, 306 insertions, 19 deletions
diff --git a/fatfs/ChangeLog b/fatfs/ChangeLog index bb80a56f..91d0642a 100644 --- a/fatfs/ChangeLog +++ b/fatfs/ChangeLog @@ -1,3 +1,21 @@ +2003-08-01 Marco Gerards <metgerards@student.han.nl> + + * node-create.c: New file. + * Makefile (SRCS): Added node-created.c. + * dir.c: Include <hurd/fsys.h>. + (diskfs_direnter_hard): Initialize a new block with zeros. Enter + direntry and setup the virtual inode. Also handle directories + correctly. + (diskfs_rewrite_hard): Function rewritten. + (diskfs_dirempty): Change logic to test if a file was deleted. + * fat.c (fat_extend_chain): Unlock spin_lock when returning from + function. Set dn->last to 0 when deallocating the complete + file. Update dn->last when not deallocating the complete file. Set + dn->first to zero when the complete file was deallocated. Also + update dn->length_of_chain to the new amount of clusters in the + chain. + * main.c (diskfs_hard_readonly): Remove global variable. + 2003-07-29 Jeff Bailey <jbailey@nisa.net> * fatfs.h (LOG2_BLOCKS_PER_CLUSTER): Fix typo. diff --git a/fatfs/Makefile b/fatfs/Makefile index 61b89302..7bdff95d 100644 --- a/fatfs/Makefile +++ b/fatfs/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 1997 Free Software Foundation +# Copyright (C) 1997, 2003 Free Software Foundation # Modified by Marcus Brinkmann, 2000-05-05 # # This program is free software; you can redistribute it and/or @@ -19,7 +19,7 @@ dir := fatfs makemode := server target = fatfs -SRCS = inode.c main.c dir.c pager.c fat.c virt-inode.c +SRCS = inode.c main.c dir.c pager.c fat.c virt-inode.c node-create.c LCLHDRS = fat.h fatfs.h virt-inode.h DIST_FILES = EXTENSIONS diff --git a/fatfs/dir.c b/fatfs/dir.c index 0b4b4599..78a44edc 100644 --- a/fatfs/dir.c +++ b/fatfs/dir.c @@ -1,5 +1,5 @@ -/* main.c - FAT filesystem. - Copyright (C) 1997, 1998, 1999, 2002 Free Software Foundation, Inc. +/* dir.c - FAT filesystem. + Copyright (C) 1997, 1998, 1999, 2002, 2003 Free Software Foundation, Inc. Written by Thomas Bushnell, n/BSG and Marcus Brinkmann. This file is part of the GNU Hurd. @@ -21,6 +21,8 @@ #include <ctype.h> #include <string.h> #include <dirent.h> +#include <hurd/fsys.h> + #include "fatfs.h" /* The size of a directory block is usually just the cluster size. @@ -617,8 +619,9 @@ diskfs_direnter_hard (struct node *dp, const char *name, struct node *np, munmap ((caddr_t) ds->mapbuf, ds->mapextent); return err; } - } - + memset ((caddr_t) ds->mapbuf + oldsize, 0, bytes_per_cluster); + } + new = (struct dirrect *) ((char *) ds->mapbuf + oldsize); dp->dn_stat.st_size = oldsize + bytes_per_cluster; @@ -642,8 +645,27 @@ diskfs_direnter_hard (struct node *dp, const char *name, struct node *np, memcpy (new->name, " ", 11); memcpy (new->name, name, namelen % 11); /* XXX */ - /* XXX We need to do much, much more here. */ - /* XXX What about creating . and .. for dirs? */ + write_word (new->first_cluster_low, np->dn->start_cluster & 0xffff); + write_word (new->first_cluster_high, np->dn->start_cluster >> 16); + write_dword (new->file_size, np->dn_stat.st_size); + + if (!(name[0] == '.' && (name[1] == '\0' + || (name[1] == '.' && name[2] =='\0')))) + { + vi_key_t entry_key; + + entry_key.dir_inode = dp->cache_id; + entry_key.dir_offset = ((int) ds->entry) - ((int) ds->mapbuf); + + /* Set the key for this inode now because it wasn't know when + the inode was initialized. */ + vi_change (vi_lookup (np->cache_id), entry_key); + + if (np->dn_stat.st_mode & S_IFDIR) + new->attribute = FAT_DIR_ATTR_DIR; + } + else + new->attribute = FAT_DIR_ATTR_DIR; /* Mark the directory inode has having been written. */ dp->dn_set_mtime = 1; @@ -692,19 +714,48 @@ diskfs_dirremove_hard (struct node *dp, struct dirstat *ds) error_t diskfs_dirrewrite_hard (struct node *dp, struct node *np, struct dirstat *ds) { + error_t err; + vi_key_t entry_key; + mach_port_t control = MACH_PORT_NULL; + struct node *oldnp; + ino_t inode; + inode_t vinode; + + /* We need the inode and vinode of the old node. */ + entry_key.dir_inode = dp->cache_id; + entry_key.dir_offset = ((int) ds->entry) - ((int) ds->mapbuf); + err = vi_rlookup (entry_key, &inode, &vinode, 0); + + assert (err != EINVAL); + + /* Lookup the node, we already have a reference. */ + oldnp = ifind (inode); + assert (ds->type == RENAME); assert (ds->stat == HERE_TIS); assert (!diskfs_readonly); - /* XXX We have to reimplement rename completely. */ - /* - ds->entry->inode = np->cache_id; - */ - dp->dn_set_mtime = 1; - + /* The link count must be 0 so the file will be removed and + the node will be dropped. */ + oldnp->dn_stat.st_nlink--; + assert (!oldnp->dn_stat.st_nlink); + + /* Close the file, free the referenced held by clients. */ + fshelp_fetch_control (&oldnp->transbox, &control); + + if (control) + { + fsys_goaway (control, FSYS_GOAWAY_UNLINK); + mach_port_deallocate (mach_task_self (), control); + } + + /* Put the new key in the vinode. */ + vi_change (vi_lookup (np->cache_id), entry_key); + munmap ((caddr_t) ds->mapbuf, ds->mapextent); + dp->dn_set_mtime = 1; diskfs_file_update (dp, 1); return 0; @@ -741,7 +792,7 @@ diskfs_dirempty (struct node *dp, struct protid *cred) if (entry->name[0] == FAT_DIR_NAME_LAST) break; - if (!entry->name[0] == FAT_DIR_NAME_DELETED + if ((char) entry->name[0] != FAT_DIR_NAME_DELETED && memcmp (entry->name, FAT_DIR_NAME_DOT, 11) && memcmp (entry->name, FAT_DIR_NAME_DOTDOT, 11)) hit = 1; diff --git a/fatfs/fat.c b/fatfs/fat.c index f2f67aa6..86fe908e 100644 --- a/fatfs/fat.c +++ b/fatfs/fat.c @@ -385,14 +385,17 @@ fat_extend_chain (struct node *node, cluster_t new_last_cluster, int create) dn->last = dn->first = *table; return 0; } - - spin_lock(&dn->chain_extension_lock); + spin_lock(&dn->chain_extension_lock); + /* If we already have what we need, or we have all clusters that are available without allocating new ones, go out. */ if (new_last_cluster < dn->length_of_chain || (!create && dn->chain_complete)) - return 0; + { + spin_unlock(&dn->chain_extension_lock); + return 0; + } left = new_last_cluster + 1 - dn->length_of_chain; @@ -517,6 +520,7 @@ fat_truncate_node (struct node *node, cluster_t clusters_to_keep) /* Deallocate the complete file. */ node->dn->start_cluster = 0; pos = count = offs = 0; + node->dn->last = 0; } else { @@ -525,6 +529,11 @@ fat_truncate_node (struct node *node, cluster_t clusters_to_keep) while (count-- > 0) { assert (next); + + /* This cluster is now the last cluster in the chain. */ + if (count == 0) + node->dn->last = next; + next = next->next; } assert (next); @@ -566,6 +575,11 @@ fat_truncate_node (struct node *node, cluster_t clusters_to_keep) free (next); next = next_next; } + + if (clusters_to_keep == 0) + node->dn->first = 0; + + node->dn->length_of_chain = clusters_to_keep; } diff --git a/fatfs/main.c b/fatfs/main.c index b6916a24..2b14c013 100644 --- a/fatfs/main.c +++ b/fatfs/main.c @@ -43,7 +43,7 @@ int diskfs_name_max = FAT_NAME_MAX; int diskfs_maxsymlinks = 8; /* XXX */ /* This filesystem is not capable of writing yet. */ -int diskfs_readonly = 1, diskfs_hard_readonly = 1; +int diskfs_readonly = 1; /* Handy source of zeroes. */ vm_address_t zerocluster; diff --git a/fatfs/node-create.c b/fatfs/node-create.c new file mode 100644 index 00000000..d85508b3 --- /dev/null +++ b/fatfs/node-create.c @@ -0,0 +1,204 @@ +/* node-create.c - Making new files. + Copyright (C) 1992,93,94,96,98,2001, 2003 Free Software Foundation + Modified for fatfs by Marco Gerards. + + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License as + published by the Free Software Foundation; either version 2, or (at + your option) any later version. + + This program is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ + + +/* This file was copied from libdiskfs and changed for fatfs. The + libdiskfs version created the "." and ".." links. After creating + those the directory was created and the "." and ".." were linked + in. In normally it is sane to do this, but this is impossible for + fatfs because fatfs doesn't support hardlinks. For fatfs the "." + and".." directory entries are created after creating the + directory. */ + + +#include <hurd/diskfs.h> + +/* This enables SysV style group behaviour. New nodes inherit the GID + of the user creating them unless the SGID bit is set of the parent + directory. */ +int _diskfs_no_inherit_dir_group; + +/* Create a new node. Give it MODE; if that includes IFDIR, also + initialize `.' and `..' in the new directory. Return the node in NPP. + CRED identifies the user responsible for the call. If NAME is nonzero, + then link the new node into DIR with name NAME; DS is the result of a + prior diskfs_lookup for creation (and DIR has been held locked since). + DIR must always be provided as at least a hint for disk allocation + strategies. */ +error_t +diskfs_create_node (struct node *dir, + const char *name, + mode_t mode, + struct node **newnode, + struct protid *cred, + struct dirstat *ds) +{ + struct node *np; + error_t err; + uid_t newuid; + gid_t newgid; + + if (diskfs_check_readonly ()) + { + *newnode = NULL; + return EROFS; + } + + /* Make the node */ + err = diskfs_alloc_node (dir, mode, newnode); + if (err) + { + if (name) + diskfs_drop_dirstat (dir, ds); + *newnode = NULL; + return err; + } + + np = *newnode; + + /* Initialize the on-disk fields. */ + if (cred->user->uids->num) + newuid = cred->user->uids->ids[0]; + else + { + newuid = dir->dn_stat.st_uid; + mode &= ~S_ISUID; + } + err = diskfs_validate_owner_change (np, newuid); + if (err) + goto change_err; + np->dn_stat.st_uid = newuid; + if (np->author_tracks_uid) + np->dn_stat.st_author = newuid; + + if (!_diskfs_no_inherit_dir_group) + { + newgid = dir->dn_stat.st_gid; + if (!idvec_contains (cred->user->gids, newgid)) + mode &= ~S_ISGID; + } + else + { + if (dir->dn_stat.st_mode & S_ISGID) + { + /* If the parent dir has the sgid bit set, inherit its gid. + If the new node is a directory, also inherit the sgid bit + set. */ + newgid = dir->dn_stat.st_gid; + if (S_ISDIR (mode)) + mode |= S_ISGID; + else + { + if (!idvec_contains (cred->user->gids, newgid)) + mode &= ~S_ISGID; + } + } + else + { + if (cred->user->gids->num) + newgid = cred->user->gids->ids[0]; + else + { + newgid = dir->dn_stat.st_gid; + mode &= ~S_ISGID; + } + } + } + + err = diskfs_validate_group_change (np, newgid); + if (err) + goto change_err; + np->dn_stat.st_gid = newgid; + + np->dn_stat.st_rdev = 0; + np->dn_stat.st_nlink = !!name; + err = diskfs_validate_mode_change (np, mode); + if (err) + goto change_err; + np->dn_stat.st_mode = mode; + + np->dn_stat.st_blocks = 0; + np->dn_stat.st_size = 0; + np->dn_stat.st_flags = 0; + np->dn_set_atime = 1; + np->dn_set_mtime = 1; + np->dn_set_ctime = 1; + + diskfs_node_update (np, 1); + + if (err) + { + change_err: + np->dn_stat.st_mode = 0; + np->dn_stat.st_nlink = 0; + if (name) + diskfs_drop_dirstat (dir, ds); + *newnode = NULL; + return err; + } + + if (name) + { + err = diskfs_direnter (dir, name, np, ds, cred); + if (err) + { + np->dn_stat.st_nlink = 0; + np->dn_set_ctime = 1; + diskfs_nput (np); + } + + /* For fatfs the "." and ".." directory entries should be + created after the directory was created and not before the + directory was created. */ + if (S_ISDIR (mode)) + err = diskfs_init_dir (np, dir, cred); + + if (err) + { + struct dirstat *ds = alloca (diskfs_dirstat_size); + struct node *foo; + /* Keep old error intact. */ + error_t err; + + np->dn_stat.st_nlink = 0; + + err = diskfs_lookup (dir, name, REMOVE, &foo, ds, cred); + if (err) + { + /* The new node couldn't be removed, we have a big + problem now. */ + *newnode = NULL; + return err; + } + + err = diskfs_dirremove (dir, foo, name, ds); + if (err) + { + diskfs_nput (np); + *newnode = NULL; + return err; + } + } + + diskfs_node_update (np, 1); + } + if (err) + *newnode = NULL; + + return err; +} |