Module Name: src
Committed By: uch
Date: Sat Jul 16 12:35:40 UTC 2011
Modified Files:
src/sys/fs/v7fs: v7fs.h v7fs_file.h v7fs_file_util.c v7fs_vnops.c
Log Message:
core symlink operation moved to v7fs_file_util.c and introduce
V7FSBSD_MAXSYMLINKLEN for makefs
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/fs/v7fs/v7fs.h src/sys/fs/v7fs/v7fs_file.h \
src/sys/fs/v7fs/v7fs_file_util.c
cvs rdiff -u -r1.3 -r1.4 src/sys/fs/v7fs/v7fs_vnops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/fs/v7fs/v7fs.h
diff -u src/sys/fs/v7fs/v7fs.h:1.1 src/sys/fs/v7fs/v7fs.h:1.2
--- src/sys/fs/v7fs/v7fs.h:1.1 Mon Jun 27 11:52:24 2011
+++ src/sys/fs/v7fs/v7fs.h Sat Jul 16 12:35:40 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: v7fs.h,v 1.1 2011/06/27 11:52:24 uch Exp $ */
+/* $NetBSD: v7fs.h,v 1.2 2011/07/16 12:35:40 uch Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -175,6 +175,6 @@
/* Don't apear original V7 filesystem. NetBSD. */
#define V7FSBSD_IFFIFO 0010000 /* Named pipe. */
-#define V7FSBSD_MAXSYMLINKS 8
+#define V7FSBSD_MAXSYMLINKLEN V7FS_BSIZE
#endif /*!_V7FS_H_ */
Index: src/sys/fs/v7fs/v7fs_file.h
diff -u src/sys/fs/v7fs/v7fs_file.h:1.1 src/sys/fs/v7fs/v7fs_file.h:1.2
--- src/sys/fs/v7fs/v7fs_file.h:1.1 Mon Jun 27 11:52:24 2011
+++ src/sys/fs/v7fs/v7fs_file.h Sat Jul 16 12:35:40 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: v7fs_file.h,v 1.1 2011/06/27 11:52:24 uch Exp $ */
+/* $NetBSD: v7fs_file.h,v 1.2 2011/07/16 12:35:40 uch Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -60,5 +60,6 @@
const char *);
bool v7fs_file_lookup_by_number(struct v7fs_self *, struct v7fs_inode *,
v7fs_ino_t, char *);
+int v7fs_file_symlink(struct v7fs_self *, struct v7fs_inode *, const char *);
__END_DECLS
#endif /*!_V7FS_INODE_H_ */
Index: src/sys/fs/v7fs/v7fs_file_util.c
diff -u src/sys/fs/v7fs/v7fs_file_util.c:1.1 src/sys/fs/v7fs/v7fs_file_util.c:1.2
--- src/sys/fs/v7fs/v7fs_file_util.c:1.1 Mon Jun 27 11:52:24 2011
+++ src/sys/fs/v7fs/v7fs_file_util.c Sat Jul 16 12:35:40 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: v7fs_file_util.c,v 1.1 2011/06/27 11:52:24 uch Exp $ */
+/* $NetBSD: v7fs_file_util.c,v 1.2 2011/07/16 12:35:40 uch Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: v7fs_file_util.c,v 1.1 2011/06/27 11:52:24 uch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: v7fs_file_util.c,v 1.2 2011/07/16 12:35:40 uch Exp $");
#ifdef _KERNEL
#include <sys/systm.h>
#include <sys/param.h>
@@ -77,6 +77,39 @@
}
int
+v7fs_file_symlink(struct v7fs_self *fs, struct v7fs_inode *p,
+ const char *target)
+{
+ int error;
+ size_t len = strlen(target) + 1;
+
+ if (len > V7FSBSD_MAXSYMLINKLEN) {/* limited target 512byte pathname */
+ DPRINTF("too long pathname.");
+ return ENAMETOOLONG;
+ }
+
+ if ((error = v7fs_datablock_expand(fs, p, len))) {
+ return error;
+ }
+
+ v7fs_daddr_t blk = p->addr[0]; /* 1block only. */
+ void *buf;
+ if (!(buf = scratch_read(fs, blk))) {
+ return EIO;
+ }
+
+ strncpy(buf, target, V7FS_BSIZE);
+ if (!fs->io.write(fs->io.cookie, buf, blk)) {
+ scratch_free(fs, buf);
+ return EIO;
+ }
+ scratch_free(fs, buf);
+ v7fs_inode_writeback(fs, p);
+
+ return 0;
+}
+
+int
v7fs_file_rename(struct v7fs_self *fs, struct v7fs_inode *parent_from,
const char *from, struct v7fs_inode *parent_to, const char *to)
{
Index: src/sys/fs/v7fs/v7fs_vnops.c
diff -u src/sys/fs/v7fs/v7fs_vnops.c:1.3 src/sys/fs/v7fs/v7fs_vnops.c:1.4
--- src/sys/fs/v7fs/v7fs_vnops.c:1.3 Wed Jul 13 12:28:57 2011
+++ src/sys/fs/v7fs/v7fs_vnops.c Sat Jul 16 12:35:40 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: v7fs_vnops.c,v 1.3 2011/07/13 12:28:57 uch Exp $ */
+/* $NetBSD: v7fs_vnops.c,v 1.4 2011/07/16 12:35:40 uch Exp $ */
/*-
* Copyright (c) 2004, 2011 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: v7fs_vnops.c,v 1.3 2011/07/13 12:28:57 uch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: v7fs_vnops.c,v 1.4 2011/07/16 12:35:40 uch Exp $");
#if defined _KERNEL_OPT
#include "opt_v7fs.h"
#endif
@@ -1130,7 +1130,7 @@
*a->a_retval = 30; /* ~1G */
break;
case _PC_SYMLINK_MAX:
- *a->a_retval = MAXPATHLEN;
+ *a->a_retval = V7FSBSD_MAXSYMLINKLEN;
break;
case _PC_2_SYMLINKS:
*a->a_retval = 1;
@@ -1224,26 +1224,7 @@
struct v7fs_node *newnode = (*a->a_vpp)->v_data;
struct v7fs_inode *p = &newnode->inode;
-
- if ((error = v7fs_datablock_expand(fs, p, len))) {
- v7fs_inode_deallocate(fs, ino);
- error = ENOSPC;
- goto unlock_exit;
- }
- v7fs_daddr_t blk = p->addr[0]; /* 1block only. */
- void *buf;
- if (!(buf = scratch_read(fs, blk))) {
- v7fs_inode_deallocate(fs, ino);
- error = EIO;
- goto unlock_exit;
- }
- strncpy(buf, from, V7FS_BSIZE);
- if (!fs->io.write(fs->io.cookie, buf, blk)) {
- scratch_free(fs, buf);
- error = EIO;
- goto unlock_exit;
- }
- scratch_free(fs, buf);
+ v7fs_file_symlink(fs, p, from);
uvm_vnp_setsize(*a->a_vpp, v7fs_inode_filesize(p));
newnode->update_ctime = true;
