projects
/
yaffs2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add ability to hide lost_n_found directory
[yaffs2.git]
/
yaffs_attribs.c
diff --git
a/yaffs_attribs.c
b/yaffs_attribs.c
index aaf46850c655252159ef32901a40884387508102..711941f137f554a2a32cd32edafd60049f7bc435 100644
(file)
--- a/
yaffs_attribs.c
+++ b/
yaffs_attribs.c
@@
-1,7
+1,7
@@
/*
* YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
*
/*
* YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
*
- * Copyright (C) 2002-201
0
Aleph One Ltd.
+ * Copyright (C) 2002-201
1
Aleph One Ltd.
* for Toby Churchill Ltd and Brightstar Engineering
*
* Created by Charles Manning <charles@aleph1.co.uk>
* for Toby Churchill Ltd and Brightstar Engineering
*
* Created by Charles Manning <charles@aleph1.co.uk>
@@
-14,6
+14,14
@@
#include "yaffs_guts.h"
#include "yaffs_attribs.h"
#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;
void yaffs_load_attribs(struct yaffs_obj *obj, struct yaffs_obj_hdr *oh)
{
obj->yst_uid = oh->yst_uid;
@@
-39,9
+47,9
@@
void yaffs_load_current_time(struct yaffs_obj *obj, int do_a, int do_c)
{
obj->yst_mtime = Y_CURRENT_TIME;
if (do_a)
{
obj->yst_mtime = Y_CURRENT_TIME;
if (do_a)
- obj->yst_atime = obj->yst_
a
time;
+ obj->yst_atime = obj->yst_
m
time;
if (do_c)
if (do_c)
- obj->yst_ctime = obj->yst_
a
time;
+ obj->yst_ctime = obj->yst_
m
time;
}
void yaffs_attribs_init(struct yaffs_obj *obj, u32 gid, u32 uid, u32 rdev)
}
void yaffs_attribs_init(struct yaffs_obj *obj, u32 gid, u32 uid, u32 rdev)
@@
-52,7
+60,7
@@
void yaffs_attribs_init(struct yaffs_obj *obj, u32 gid, u32 uid, u32 rdev)
obj->yst_gid = gid;
}
obj->yst_gid = gid;
}
-loff_t yaffs_get_file_size(struct yaffs_obj *obj)
+
static
loff_t yaffs_get_file_size(struct yaffs_obj *obj)
{
YCHAR *alias = NULL;
obj = yaffs_get_equivalent_obj(obj);
{
YCHAR *alias = NULL;
obj = yaffs_get_equivalent_obj(obj);
@@
-64,7
+72,7
@@
loff_t yaffs_get_file_size(struct yaffs_obj *obj)
alias = obj->variant.symlink_variant.alias;
if (!alias)
return 0;
alias = obj->variant.symlink_variant.alias;
if (!alias)
return 0;
- return
yaffs_
strnlen(alias, YAFFS_MAX_ALIAS_LENGTH);
+ return strnlen(alias, YAFFS_MAX_ALIAS_LENGTH);
default:
return 0;
}
default:
return 0;
}
@@
-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)
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)
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);
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_mode = obj->yst_mode;
valid |= ATTR_MODE;
- attr->
ia_uid
= obj->yst_uid;
+ attr->
IATTR_UID
= obj->yst_uid;
valid |= ATTR_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;
valid |= ATTR_GID;
Y_TIME_CONVERT(attr->ia_atime) = obj->yst_atime;