From: Tracey Dent <tdent48227@gmail.com>
To: greg@kroah.com
Cc: manningc2@actrix.gen.nz, linux-kernel@vger.kernel.org,
linux-fsdevel@vger.kernel.org, Tracey Dent <tdent48227@gmail.com>
Subject: [PATCH 16/29] Staging: yaffs2: yaffs_nameval: Add files
Date: Mon, 1 Nov 2010 14:41:04 -0400 [thread overview]
Message-ID: <1288636877-7964-17-git-send-email-tdent48227@gmail.com> (raw)
In-Reply-To: <1288636877-7964-1-git-send-email-tdent48227@gmail.com>
Adding files to yaffs2 directory.
Signed-off-by: Tracey Dent <tdent48227@gmail.com>
---
drivers/staging/yaffs2/yaffs_nameval.c | 197 ++++++++++++++++++++++++++++++++
drivers/staging/yaffs2/yaffs_nameval.h | 26 ++++
2 files changed, 223 insertions(+), 0 deletions(-)
create mode 100644 drivers/staging/yaffs2/yaffs_nameval.c
create mode 100644 drivers/staging/yaffs2/yaffs_nameval.h
diff --git a/drivers/staging/yaffs2/yaffs_nameval.c b/drivers/staging/yaffs2/yaffs_nameval.c
new file mode 100644
index 0000000..a4ed297
--- /dev/null
+++ b/drivers/staging/yaffs2/yaffs_nameval.c
@@ -0,0 +1,197 @@
+/*
+ * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
+ *
+ * Copyright (C) 2002-2010 Aleph One Ltd.
+ * for Toby Churchill Ltd and Brightstar Engineering
+ *
+ * Created by Charles Manning <charles@aleph1.co.uk>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+/*
+ * This simple implementation of a name-value store assumes a small number of values and fits
+ * into a small finite buffer.
+ *
+ * Each attribute is stored as a record:
+ * sizeof(int) bytes record size.
+ * strnlen+1 bytes name null terminated.
+ * nbytes value.
+ * ----------
+ * total size stored in record size
+ *
+ * This code has not been tested with unicode yet.
+ */
+
+
+#include "yaffs_nameval.h"
+
+#include "yportenv.h"
+
+static int nval_find(const char *xb, int xb_size, const YCHAR *name,
+ int *exist_size)
+{
+ int pos=0;
+ int size;
+
+ memcpy(&size,xb,sizeof(int));
+ while(size > 0 && (size < xb_size) && (pos + size < xb_size)){
+ if(yaffs_strncmp((YCHAR *)(xb+pos+sizeof(int)),name,size) == 0){
+ if(exist_size)
+ *exist_size = size;
+ return pos;
+ }
+ pos += size;
+ if(pos < xb_size -sizeof(int))
+ memcpy(&size,xb + pos,sizeof(int));
+ else
+ size = 0;
+ }
+ if(exist_size)
+ *exist_size = 0;
+ return -1;
+}
+
+static int nval_used(const char *xb, int xb_size)
+{
+ int pos=0;
+ int size;
+
+ memcpy(&size,xb + pos,sizeof(int));
+ while(size > 0 && (size < xb_size) && (pos + size < xb_size)){
+ pos += size;
+ if(pos < xb_size -sizeof(int))
+ memcpy(&size,xb + pos,sizeof(int));
+ else
+ size = 0;
+ }
+ return pos;
+}
+
+int nval_del(char *xb, int xb_size, const YCHAR *name)
+{
+ int pos = nval_find(xb, xb_size, name, NULL);
+ int size;
+
+ if(pos >= 0 && pos < xb_size){
+ /* Find size, shift rest over this record, then zero out the rest of buffer */
+ memcpy(&size,xb+pos,sizeof(int));
+ memcpy(xb + pos, xb + pos + size, xb_size - (pos + size));
+ memset(xb + (xb_size - size),0,size);
+ return 0;
+ } else
+ return -ENODATA;
+}
+
+int nval_set(char *xb, int xb_size, const YCHAR *name, const char *buf, int bsize, int flags)
+{
+ int pos;
+ int namelen = yaffs_strnlen(name,xb_size);
+ int reclen;
+ int size_exist = 0;
+ int space;
+ int start;
+
+ pos = nval_find(xb,xb_size,name, &size_exist);
+
+ if(flags & XATTR_CREATE && pos >= 0)
+ return -EEXIST;
+ if(flags & XATTR_REPLACE && pos < 0)
+ return -ENODATA;
+
+ start = nval_used(xb,xb_size);
+ space = xb_size - start + size_exist;
+
+ reclen = (sizeof(int) + namelen + 1 + bsize);
+
+ if(reclen > space)
+ return -ENOSPC;
+
+ if(pos >= 0){
+ nval_del(xb,xb_size,name);
+ start = nval_used(xb, xb_size);
+ }
+
+ pos = start;
+
+ memcpy(xb + pos,&reclen,sizeof(int));
+ pos +=sizeof(int);
+ yaffs_strncpy((YCHAR *)(xb + pos), name, reclen);
+ pos+= (namelen+1);
+ memcpy(xb + pos,buf,bsize);
+ return 0;
+}
+
+int nval_get(const char *xb, int xb_size, const YCHAR *name, char *buf, int bsize)
+{
+ int pos = nval_find(xb,xb_size,name,NULL);
+ int size;
+
+ if(pos >= 0 && pos< xb_size){
+
+ memcpy(&size,xb +pos,sizeof(int));
+ pos+=sizeof(int); /* advance past record length */
+ size -= sizeof(int);
+
+ /* Advance over name string */
+ while(xb[pos] && size > 0 && pos < xb_size){
+ pos++;
+ size--;
+ }
+ /*Advance over NUL */
+ pos++;
+ size--;
+
+ if(size <= bsize){
+ memcpy(buf,xb + pos,size);
+ return size;
+ }
+
+ }
+ if(pos >= 0)
+ return -ERANGE;
+ else
+ return -ENODATA;
+}
+
+int nval_list(const char *xb, int xb_size, char *buf, int bsize)
+{
+ int pos = 0;
+ int size;
+ int name_len;
+ int ncopied = 0;
+ int filled = 0;
+
+ memcpy(&size,xb + pos,sizeof(int));
+ while(size > sizeof(int) && size <= xb_size && (pos + size) < xb_size && !filled){
+ pos+= sizeof(int);
+ size-=sizeof(int);
+ name_len = yaffs_strnlen((YCHAR *)(xb + pos), size);
+ if(ncopied + name_len + 1 < bsize){
+ memcpy(buf,xb+pos,name_len * sizeof(YCHAR));
+ buf+= name_len;
+ *buf = '\0';
+ buf++;
+ if(sizeof(YCHAR) > 1){
+ *buf = '\0';
+ buf++;
+ }
+ ncopied += (name_len+1);
+ } else
+ filled = 1;
+ pos+=size;
+ if(pos < xb_size -sizeof(int))
+ memcpy(&size,xb + pos,sizeof(int));
+ else
+ size = 0;
+ }
+ return ncopied;
+}
+
+
+int nval_hasvalues(const char *xb, int xb_size)
+{
+ return nval_used(xb, xb_size) > 0;
+}
diff --git a/drivers/staging/yaffs2/yaffs_nameval.h b/drivers/staging/yaffs2/yaffs_nameval.h
new file mode 100644
index 0000000..bd80859
--- /dev/null
+++ b/drivers/staging/yaffs2/yaffs_nameval.h
@@ -0,0 +1,26 @@
+/*
+ * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
+ *
+ * Copyright (C) 2002-2010 Aleph One Ltd.
+ * for Toby Churchill Ltd and Brightstar Engineering
+ *
+ * Created by Charles Manning <charles@aleph1.co.uk>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 2.1 as
+ * published by the Free Software Foundation.
+ *
+ * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
+ */
+
+#ifndef __NAMEVAL_H__
+#define __NAMEVAL_H__
+
+#include "yportenv.h"
+
+int nval_del(char *xb, int xb_size, const YCHAR *name);
+int nval_set(char *xb, int xb_size, const YCHAR *name, const char *buf, int bsize, int flags);
+int nval_get(const char *xb, int xb_size, const YCHAR *name, char *buf, int bsize);
+int nval_list(const char *xb, int xb_size, char *buf, int bsize);
+int nval_hasvalues(const char *xb, int xb_size);
+#endif
--
1.7.3.2.146.gca209
next prev parent reply other threads:[~2010-11-01 18:42 UTC|newest]
Thread overview: 69+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-01 18:40 [PATCH 0/29] Staging: Add yaffs2 filesystem Tracey Dent
2010-11-01 18:40 ` [PATCH 01/29] Staging: Add yaffs2 support Tracey Dent
2010-11-01 18:40 ` [PATCH 02/29] Staging: yaffs2: Add Makefile and Kconfig files Tracey Dent
2010-11-01 18:40 ` [PATCH 03/29] Staging: yaffs2: devextras.h: Add file Tracey Dent
2010-11-01 18:56 ` Pekka Enberg
2010-11-01 20:07 ` Greg KH
2010-11-01 18:40 ` [PATCH 04/29] Staging: yaffs2: moduleconfig.h: " Tracey Dent
2010-11-01 18:57 ` Pekka Enberg
2010-11-01 19:25 ` Tracey Dent
2010-11-01 18:40 ` [PATCH 05/29] Staging: yaffs2: yaffs_allocator: Add files Tracey Dent
2010-11-01 18:58 ` Pekka Enberg
2010-11-01 19:19 ` Charles Manning
2010-11-01 19:23 ` Pekka Enberg
2010-11-01 19:25 ` Pekka Enberg
2010-11-01 18:40 ` [PATCH 06/29] Staging: yaffs2: yaffs_bitmap: " Tracey Dent
2010-11-01 19:01 ` Pekka Enberg
2010-11-01 18:40 ` [PATCH 07/29] Staging: yaffs2: yaffs_checkptrw: " Tracey Dent
2010-11-01 21:09 ` Jesper Juhl
2010-11-01 21:16 ` Jesper Juhl
2010-11-01 18:40 ` [PATCH 08/29] Staging: yaffs2: yaffs_ecc: " Tracey Dent
2010-11-01 19:04 ` Pekka Enberg
2010-11-01 19:50 ` Paul Mundt
2010-11-01 18:40 ` [PATCH 09/29] Staging: yaffs2: yaffs_getblockinfo.h: Add file Tracey Dent
2010-11-01 18:40 ` [PATCH 10/29] Staging: yaffs2: yaffs_guts: Add files Tracey Dent
2010-11-01 19:51 ` Jesper Juhl
2010-11-01 18:40 ` [PATCH 11/29] Staging: yaffs2: yaffs_linux.h: Add file Tracey Dent
2010-11-01 18:41 ` [PATCH 12/29] Staging: yaffs2: yaffs_list.h: add file Tracey Dent
2010-11-01 19:08 ` Pekka Enberg
2010-11-01 18:41 ` [PATCH 13/29] Staging: yaffs2: yaffs_mtdif: Add files Tracey Dent
2010-11-01 18:41 ` [PATCH 14/29] Staging: yaffs2: yaffs_mtdif1: " Tracey Dent
2010-11-01 18:41 ` [PATCH 15/29] Staging: yaffs2: yaffs_mtdif2: " Tracey Dent
2010-11-01 19:05 ` Jesper Juhl
2010-11-01 18:41 ` Tracey Dent [this message]
2010-11-01 18:41 ` [PATCH 17/29] Staging: yaffs2: yaffs_nand: " Tracey Dent
2010-11-01 18:41 ` [PATCH 18/29] Staging: yaffs2: yaffs_packedtags1: " Tracey Dent
2010-11-01 18:41 ` [PATCH 19/29] Staging: yaffs2: yaffs_packedtags2: " Tracey Dent
2010-11-01 18:41 ` [PATCH 20/29] Staging: yaffs2: yaffs_qsort.h: Add file Tracey Dent
2010-11-01 19:12 ` Pekka Enberg
2010-11-01 18:41 ` [PATCH 21/29] Staging: yaffs2: yaffs_tagscompact: Add files Tracey Dent
2010-11-01 20:32 ` Jesper Juhl
2010-11-01 18:41 ` [PATCH 22/29] Staging: yaffs2: yaffs_tagsvalidity: " Tracey Dent
2010-11-01 18:41 ` [PATCH 23/29] Staging: yaffs2: yaffs_trace.h: Add file Tracey Dent
2010-11-01 18:41 ` [PATCH 24/29] Staging: yaffs2: yaffs_verify: Add files Tracey Dent
2010-11-01 19:16 ` Jesper Juhl
2010-11-01 19:30 ` Pekka Enberg
2010-11-01 18:41 ` [PATCH 25/29] Staging: yaffs2: yaffs_vfs_glue.c: Add file Tracey Dent
2010-11-01 18:41 ` [PATCH 26/29] Staging: yaffs2: yaffs_yaffs1: Add files Tracey Dent
2010-11-01 18:41 ` [PATCH 27/29] Staging: yaffs2: yaffs_yaffs2: " Tracey Dent
2010-11-01 18:41 ` [PATCH 28/29] Staging: yaffs2: yportenv.h: Add file Tracey Dent
2010-11-01 19:18 ` Pekka Enberg
2010-11-01 18:41 ` [PATCH 29/29] Staging: yaffs2: TODO: Add TODO file Tracey Dent
2010-11-01 19:20 ` Pekka Enberg
2010-11-01 19:38 ` Charles Manning
2010-11-01 18:55 ` [PATCH 0/29] Staging: Add yaffs2 filesystem David Daney
2010-11-01 19:04 ` Greg KH
2010-11-01 19:14 ` Charles Manning
2010-11-01 19:23 ` Tracey Dent
2010-11-01 19:24 ` David Daney
2010-11-01 19:32 ` Charles Manning
2010-11-01 19:36 ` Tracey Dent
2010-11-01 20:13 ` Greg KH
2010-11-01 20:46 ` Tracey Dent
2010-11-01 21:00 ` David Daney
2010-11-02 1:37 ` Tracey Dent
2010-11-02 3:01 ` Greg KH
2010-11-02 7:34 ` Tracey Dent
2010-11-01 19:34 ` Tracey Dent
2010-11-01 20:16 ` David Daney
2010-11-01 19:06 ` Pekka Enberg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1288636877-7964-17-git-send-email-tdent48227@gmail.com \
--to=tdent48227@gmail.com \
--cc=greg@kroah.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=manningc2@actrix.gen.nz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).