projects
/
yaffs2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
yaffs: Replace yaffs_dir_llseek with Linux generic llseek
[yaffs2.git]
/
yaffs_vfs_single.c
diff --git
a/yaffs_vfs_single.c
b/yaffs_vfs_single.c
index c5376e947785231003ed2e397d48c09f40155d87..0e2095fb23b7975f5674d71c1074051169cdb5e9 100644
(file)
--- a/
yaffs_vfs_single.c
+++ b/
yaffs_vfs_single.c
@@
-185,8
+185,6
@@
static void *yaffs_follow_link(struct dentry *dentry, struct nameidata *nd);
static void yaffs_touch_super(struct yaffs_dev *dev);
static void yaffs_touch_super(struct yaffs_dev *dev);
-static loff_t yaffs_dir_llseek(struct file *file, loff_t offset, int origin);
-
static int yaffs_vfs_setattr(struct inode *, struct iattr *);
static struct address_space_operations yaffs_file_address_operations = {
static int yaffs_vfs_setattr(struct inode *, struct iattr *);
static struct address_space_operations yaffs_file_address_operations = {
@@
-255,7
+253,7
@@
static const struct file_operations yaffs_dir_operations = {
.read = generic_read_dir,
.readdir = yaffs_readdir,
.fsync = yaffs_sync_object,
.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 = {
};
static const struct super_operations yaffs_super_ops = {
@@
-1126,31
+1124,6
@@
static void yaffs_release_space(struct file *f)
yaffs_gross_unlock(dev);
}
yaffs_gross_unlock(dev);
}
-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)
{
struct yaffs_obj *obj;
static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir)
{
struct yaffs_obj *obj;