diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2013-12-16 07:51:19 +0000 |
---|---|---|
committer | Gabor Juhos <juhosg@openwrt.org> | 2013-12-16 07:51:19 +0000 |
commit | a8feb12f58ff4bbedfc448cd99107f130bc322a8 (patch) | |
tree | c3baa813b2d49c1e5302c7561a89be81af5b3fe0 /target/linux/generic/patches-3.10/503-yaffs-Replace-yaffs_dir_llseek-with-Linux-generic-ll.patch | |
parent | a8bc7f528ac71cb6b7405c12cc3c1878b2992164 (diff) | |
download | upstream-a8feb12f58ff4bbedfc448cd99107f130bc322a8.tar.gz upstream-a8feb12f58ff4bbedfc448cd99107f130bc322a8.tar.bz2 upstream-a8feb12f58ff4bbedfc448cd99107f130bc322a8.zip |
kernel: update yaffs code
Use the latest version of the yaffs code. Fetched from the
yaffs2 git tree and it is based on the following commit:
commit bc76682d93955cfb33051beb503ad9f8a5450578
Merge: 3a8580e ffa781d
Author: Charles Manning <cdhmanning@gmail.com>
Date: Thu Jul 11 17:46:25 2013 +1200
Merge branch 'master' of ssh://www.aleph1.co.uk/home/aleph1/git/yaffs2
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39084 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.10/503-yaffs-Replace-yaffs_dir_llseek-with-Linux-generic-ll.patch')
-rw-r--r-- | target/linux/generic/patches-3.10/503-yaffs-Replace-yaffs_dir_llseek-with-Linux-generic-ll.patch | 72 |
1 files changed, 0 insertions, 72 deletions
diff --git a/target/linux/generic/patches-3.10/503-yaffs-Replace-yaffs_dir_llseek-with-Linux-generic-ll.patch b/target/linux/generic/patches-3.10/503-yaffs-Replace-yaffs_dir_llseek-with-Linux-generic-ll.patch deleted file mode 100644 index d283e8559c..0000000000 --- a/target/linux/generic/patches-3.10/503-yaffs-Replace-yaffs_dir_llseek-with-Linux-generic-ll.patch +++ /dev/null @@ -1,72 +0,0 @@ -From cd6657c4bde20886b0805ea9f2cbac7ec25ac2e5 Mon Sep 17 00:00:00 2001 -From: Charles Manning <cdhmanning@gmail.com> -Date: Tue, 30 Nov 2010 16:01:28 +1300 -Subject: [PATCH 1/2] yaffs: Replace yaffs_dir_llseek with Linux generic - llseek - -commit ed8188fb7659cfb65b5adbe154d143190ade0324 upstream. - -There was not much point in having the yaffs version as it is -functionally equivalent to the kernel one. - -This also gets rid of using BKL in yaffs2. - -Signed-off-by: Charles Manning <cdhmanning@gmail.com> ---- - yaffs_vfs.c | 30 +----------------------------- - yaffs_vfs_multi.c | 30 +----------------------------- - 2 files changed, 2 insertions(+), 58 deletions(-) - ---- a/fs/yaffs2/yaffs_vfs_glue.c -+++ b/fs/yaffs2/yaffs_vfs_glue.c -@@ -342,8 +342,6 @@ static int yaffs_follow_link(struct dent - - static void yaffs_touch_super(yaffs_dev_t *dev); - --static loff_t yaffs_dir_llseek(struct file *file, loff_t offset, int origin); -- - static int yaffs_vfs_setattr(struct inode *, struct iattr *); - - -@@ -460,7 +458,7 @@ static const struct file_operations yaff - .read = generic_read_dir, - .readdir = yaffs_readdir, - .fsync = yaffs_sync_object, -- .llseek = yaffs_dir_llseek, -+ .llseek = generic_file_llseek, - }; - - static const struct super_operations yaffs_super_ops = { -@@ -1534,32 +1532,6 @@ static void yaffs_release_space(struct f - } - - --static loff_t yaffs_dir_llseek(struct file *file, loff_t offset, int origin) --{ -- long long retval; -- -- lock_kernel(); -- -- switch (origin){ -- case 2: -- offset += i_size_read(file->f_path.dentry->d_inode); -- break; -- case 1: -- offset += file->f_pos; -- } -- retval = -EINVAL; -- -- if (offset >= 0){ -- if (offset != file->f_pos) -- file->f_pos = offset; -- -- retval = offset; -- } -- unlock_kernel(); -- return retval; --} -- -- - static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir) - { - yaffs_obj_t *obj; |