git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
[pandora-kernel.git]
/
fs
/
ramfs
/
file-nommu.c
diff --git
a/fs/ramfs/file-nommu.c
b/fs/ramfs/file-nommu.c
index
5ea4ad8
..
d532c20
100644
(file)
--- a/
fs/ramfs/file-nommu.c
+++ b/
fs/ramfs/file-nommu.c
@@
-42,7
+42,7
@@
const struct file_operations ramfs_file_operations = {
.aio_read = generic_file_aio_read,
.write = do_sync_write,
.aio_write = generic_file_aio_write,
.aio_read = generic_file_aio_read,
.write = do_sync_write,
.aio_write = generic_file_aio_write,
- .fsync =
simple_sync_file
,
+ .fsync =
noop_fsync
,
.splice_read = generic_file_splice_read,
.splice_write = generic_file_splice_write,
.llseek = generic_file_llseek,
.splice_read = generic_file_splice_read,
.splice_write = generic_file_splice_write,
.llseek = generic_file_llseek,
@@
-146,7
+146,7
@@
static int ramfs_nommu_resize(struct inode *inode, loff_t newsize, loff_t size)
return ret;
}
return ret;
}
- ret =
vmtruncat
e(inode, newsize);
+ ret =
simple_setsiz
e(inode, newsize);
return ret;
}
return ret;
}
@@
-169,7
+169,8
@@
static int ramfs_nommu_setattr(struct dentry *dentry, struct iattr *ia)
/* pick out size-changing events */
if (ia->ia_valid & ATTR_SIZE) {
/* pick out size-changing events */
if (ia->ia_valid & ATTR_SIZE) {
- loff_t size = i_size_read(inode);
+ loff_t size = inode->i_size;
+
if (ia->ia_size != size) {
ret = ramfs_nommu_resize(inode, ia->ia_size, size);
if (ret < 0 || ia->ia_valid == ATTR_SIZE)
if (ia->ia_size != size) {
ret = ramfs_nommu_resize(inode, ia->ia_size, size);
if (ret < 0 || ia->ia_valid == ATTR_SIZE)
@@
-182,7
+183,7
@@
static int ramfs_nommu_setattr(struct dentry *dentry, struct iattr *ia)
}
}
}
}
-
ret = inode
_setattr(inode, ia);
+
generic
_setattr(inode, ia);
out:
ia->ia_valid = old_ia_valid;
return ret;
out:
ia->ia_valid = old_ia_valid;
return ret;