summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-07-27 12:12:10 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-07-27 12:12:10 -0700
commit2bc20d09b03bca6e068e07440812d75b70b1c0b2 (patch)
tree50711d4320e12efd1439639af8464b69a3b7af6a /include
parentc7425eb4814bce40f3d117ff7a7870cc12e350e3 (diff)
parentf1015c447781729060c415f5133164c638561f25 (diff)
downloadop-kernel-dev-2bc20d09b03bca6e068e07440812d75b70b1c0b2.zip
op-kernel-dev-2bc20d09b03bca6e068e07440812d75b70b1c0b2.tar.gz
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6: jbd: fix race between write_metadata_buffer and get_write_access ext3: Get rid of extenddisksize parameter of ext3_get_blocks_handle() jbd: Fix a race between checkpointing code and journal_get_write_access() ext3: Fix truncation of symlinks after failed write jbd: Fail to load a journal if it is too short
Diffstat (limited to 'include')
-rw-r--r--include/linux/ext3_fs.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/ext3_fs.h b/include/linux/ext3_fs.h
index 634a5e5..7499b36 100644
--- a/include/linux/ext3_fs.h
+++ b/include/linux/ext3_fs.h
@@ -874,7 +874,7 @@ struct buffer_head * ext3_getblk (handle_t *, struct inode *, long, int, int *);
struct buffer_head * ext3_bread (handle_t *, struct inode *, int, int, int *);
int ext3_get_blocks_handle(handle_t *handle, struct inode *inode,
sector_t iblock, unsigned long maxblocks, struct buffer_head *bh_result,
- int create, int extend_disksize);
+ int create);
extern struct inode *ext3_iget(struct super_block *, unsigned long);
extern int ext3_write_inode (struct inode *, int);
OpenPOWER on IntegriCloud