diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-07-05 23:09:37 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-07-05 23:09:37 +0000 |
| commit | aba344fdfed81b2c03d6114c54cfd73a486aa10b (patch) | |
| tree | d032d8430bf1234c3ecc6f6330d6de6e887e5963 /fs/ext2/file.c | |
| parent | 40c138bfc6d37dbff5339f84575db1e3cec6e34e (diff) | |
Merge with Linux 2.3.9.
Diffstat (limited to 'fs/ext2/file.c')
| -rw-r--r-- | fs/ext2/file.c | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/fs/ext2/file.c b/fs/ext2/file.c index c90419ce3..e223ce277 100644 --- a/fs/ext2/file.c +++ b/fs/ext2/file.c @@ -37,7 +37,6 @@ #define MIN(a,b) (((a)<(b))?(a):(b)) #define MAX(a,b) (((a)>(b))?(a):(b)) -static int ext2_writepage (struct file * file, struct page * page); static long long ext2_file_lseek(struct file *, long long, int); #if BITS_PER_LONG < 64 static int ext2_open_file (struct inode *, struct file *); @@ -106,23 +105,16 @@ static inline void remove_suid(struct inode *inode) } } -static int ext2_writepage (struct file * file, struct page * page) -{ - return block_write_full_page(file, page, ext2_getblk_block); -} - -static long ext2_write_one_page (struct file *file, struct page *page, unsigned long offset, unsigned long bytes, const char * buf) -{ - return block_write_partial_page(file, page, offset, bytes, buf, ext2_getblk_block); -} - /* * Write to a file (through the page cache). */ static ssize_t ext2_file_write(struct file *file, const char *buf, size_t count, loff_t *ppos) { - ssize_t retval = generic_file_write(file, buf, count, ppos, ext2_write_one_page); + ssize_t retval; + + retval = generic_file_write(file, buf, count, + ppos, block_write_partial_page); if (retval > 0) { struct inode *inode = file->f_dentry->d_inode; remove_suid(inode); @@ -195,9 +187,9 @@ struct inode_operations ext2_file_inode_operations = { NULL, /* rename */ NULL, /* readlink */ NULL, /* follow_link */ - ext2_bmap, /* bmap */ + ext2_get_block, /* get_block */ block_read_full_page, /* readpage */ - ext2_writepage, /* writepage */ + block_write_full_page, /* writepage */ block_flushpage, /* flushpage */ ext2_truncate, /* truncate */ ext2_permission, /* permission */ |