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 'for-linus' of git://oss.sgi.com/xfs/xfs
[pandora-kernel.git]
/
fs
/
xfs
/
linux-2.6
/
xfs_file.c
diff --git
a/fs/xfs/linux-2.6/xfs_file.c
b/fs/xfs/linux-2.6/xfs_file.c
index
7f782af
..
8073f61
100644
(file)
--- a/
fs/xfs/linux-2.6/xfs_file.c
+++ b/
fs/xfs/linux-2.6/xfs_file.c
@@
-944,7
+944,7
@@
xfs_file_fallocate(
iattr.ia_valid = ATTR_SIZE;
iattr.ia_size = new_size;
- error = -xfs_setattr(ip, &iattr, XFS_ATTR_NOLOCK);
+ error = -xfs_setattr
_size
(ip, &iattr, XFS_ATTR_NOLOCK);
}
out_unlock: