diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-05-31 13:14:26 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-05-31 13:14:26 +0900 |
| commit | d5b732b17ca2fc74f370bdba5aae6c804fac8c35 (patch) | |
| tree | 4facc6d96116b032a3c1cb2ced9b2a3008e9216e /fs/ufs/file.c | |
| parent | eb6e8605ee5f5b4e116451bf01b3f35eac446dde (diff) | |
| parent | 67a3e12b05e055c0415c556a315a3d3eb637e29e (diff) | |
| download | lwn-d5b732b17ca2fc74f370bdba5aae6c804fac8c35.tar.gz lwn-d5b732b17ca2fc74f370bdba5aae6c804fac8c35.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs/ufs/file.c')
| -rw-r--r-- | fs/ufs/file.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/ufs/file.c b/fs/ufs/file.c index a8962cecde5b..33afa20d4509 100644 --- a/fs/ufs/file.c +++ b/fs/ufs/file.c @@ -24,7 +24,6 @@ */ #include <linux/fs.h> -#include <linux/quotaops.h> #include "ufs_fs.h" #include "ufs.h" @@ -41,7 +40,7 @@ const struct file_operations ufs_file_operations = { .write = do_sync_write, .aio_write = generic_file_aio_write, .mmap = generic_file_mmap, - .open = dquot_file_open, - .fsync = simple_fsync, + .open = generic_file_open, + .fsync = generic_file_fsync, .splice_read = generic_file_splice_read, }; |