diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2015-03-31 15:31:57 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2015-03-31 15:31:57 +0000 |
| commit | 82f0308be91d572df10dadfe59f196e14760dc3d (patch) | |
| tree | 06f81e98d755d3b1d9a199b9b78a277ce3577b03 /target/linux/generic/files/fs/yaffs2/yaffs_attribs.c | |
| parent | 640318e62090821c1778dc9e3dfc5608bdcd7f0b (diff) | |
| download | upstream-82f0308be91d572df10dadfe59f196e14760dc3d.tar.gz upstream-82f0308be91d572df10dadfe59f196e14760dc3d.tar.bz2 upstream-82f0308be91d572df10dadfe59f196e14760dc3d.zip | |
kernel: update yaffs code to the latest version
Use the latest version of the yaffs code. Fetched from the
yaffs2 git tree and it is based on the following commit:
commit 7e5cf0fa1b694f835cdc184a8395b229fa29f9ae
Author: Charles Manning <cdhmanning@gmail.com>
Date: Thu Aug 7 11:25:05 2014 +1200
yaffs-direct: Basic tests. Add lpthread flag for background gc support
Signed-off-by: Charles Manning <cdhmanning@gmail.com>
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 45188
Diffstat (limited to 'target/linux/generic/files/fs/yaffs2/yaffs_attribs.c')
| -rw-r--r-- | target/linux/generic/files/fs/yaffs2/yaffs_attribs.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/target/linux/generic/files/fs/yaffs2/yaffs_attribs.c b/target/linux/generic/files/fs/yaffs2/yaffs_attribs.c index 3d778f2266..711941f137 100644 --- a/target/linux/generic/files/fs/yaffs2/yaffs_attribs.c +++ b/target/linux/generic/files/fs/yaffs2/yaffs_attribs.c @@ -14,6 +14,14 @@ #include "yaffs_guts.h" #include "yaffs_attribs.h" +#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 14, 0)) +#define IATTR_UID ia_uid +#define IATTR_GID ia_gid +#else +#define IATTR_UID ia_uid.val +#define IATTR_GID ia_gid.val +#endif + void yaffs_load_attribs(struct yaffs_obj *obj, struct yaffs_obj_hdr *oh) { obj->yst_uid = oh->yst_uid; @@ -77,9 +85,9 @@ int yaffs_set_attribs(struct yaffs_obj *obj, struct iattr *attr) if (valid & ATTR_MODE) obj->yst_mode = attr->ia_mode; if (valid & ATTR_UID) - obj->yst_uid = attr->ia_uid; + obj->yst_uid = attr->IATTR_UID; if (valid & ATTR_GID) - obj->yst_gid = attr->ia_gid; + obj->yst_gid = attr->IATTR_GID; if (valid & ATTR_ATIME) obj->yst_atime = Y_TIME_CONVERT(attr->ia_atime); @@ -103,9 +111,9 @@ int yaffs_get_attribs(struct yaffs_obj *obj, struct iattr *attr) attr->ia_mode = obj->yst_mode; valid |= ATTR_MODE; - attr->ia_uid = obj->yst_uid; + attr->IATTR_UID = obj->yst_uid; valid |= ATTR_UID; - attr->ia_gid = obj->yst_gid; + attr->IATTR_GID = obj->yst_gid; valid |= ATTR_GID; Y_TIME_CONVERT(attr->ia_atime) = obj->yst_atime; |