diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-28 13:07:48 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-28 13:07:48 -0400 |
commit | 89ad6a6173127e5d31bea7a4a45ec23fa5bf4a17 (patch) | |
tree | 6feb3d663ee48b790a0be2420647e43bc20c31ad /fs/udf/file.c | |
parent | aa36c7bf987dfa5597c0f7c46f8fca46b2dd33d2 (diff) | |
parent | 49837a80b38b79a7c06217b2c40842aeb6fa13b9 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
remove detritus left by "mm: make read_cache_page synchronous"
fix fs/sysv s_dirt handling
fat: convert to use the new truncate convention.
ext2: convert to use the new truncate convention.
tmpfs: convert to use the new truncate convention
fs: convert simple fs to new truncate
kill spurious reference to vmtruncate
fs: introduce new truncate sequence
fs/super: fix kernel-doc warning
fs/minix: bugfix, number of indirect block ptrs per block depends on block size
rename the generic fsync implementations
drop unused dentry argument to ->fsync
fs: Add missing mutex_unlock
Fix racy use of anon_inode_getfd() in perf_event.c
get rid of the magic around f_count in aio
VFS: fix recent breakage of FS_REVAL_DOT
Revert "anon_inode: set S_IFREG on the anon_inode"
Diffstat (limited to 'fs/udf/file.c')
-rw-r--r-- | fs/udf/file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/udf/file.c b/fs/udf/file.c index baae3a723946..0660280aa180 100644 --- a/fs/udf/file.c +++ b/fs/udf/file.c | |||
@@ -224,7 +224,7 @@ const struct file_operations udf_file_operations = { | |||
224 | .write = do_sync_write, | 224 | .write = do_sync_write, |
225 | .aio_write = udf_file_aio_write, | 225 | .aio_write = udf_file_aio_write, |
226 | .release = udf_release_file, | 226 | .release = udf_release_file, |
227 | .fsync = simple_fsync, | 227 | .fsync = generic_file_fsync, |
228 | .splice_read = generic_file_splice_read, | 228 | .splice_read = generic_file_splice_read, |
229 | .llseek = generic_file_llseek, | 229 | .llseek = generic_file_llseek, |
230 | }; | 230 | }; |