diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2010-08-26 13:22:27 -0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2010-08-26 13:22:27 -0400 |
| commit | f632265d0ffb5acf331252d98c64939849d96bb2 (patch) | |
| tree | 31187d9a726bf1ca6ca12e26ad8e7c609eaf4d8b /fs/gfs2/bmap.h | |
| parent | 7d94784293096c0a46897acdb83be5abd9278ece (diff) | |
| parent | da5cabf80e2433131bf0ed8993abc0f7ea618c73 (diff) | |
Merge commit 'v2.6.36-rc1' into HEAD
Diffstat (limited to 'fs/gfs2/bmap.h')
| -rw-r--r-- | fs/gfs2/bmap.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/gfs2/bmap.h b/fs/gfs2/bmap.h index c983177e05ac..a20a5213135a 100644 --- a/fs/gfs2/bmap.h +++ b/fs/gfs2/bmap.h | |||
| @@ -52,6 +52,6 @@ int gfs2_truncatei(struct gfs2_inode *ip, u64 size); | |||
| 52 | int gfs2_truncatei_resume(struct gfs2_inode *ip); | 52 | int gfs2_truncatei_resume(struct gfs2_inode *ip); |
| 53 | int gfs2_file_dealloc(struct gfs2_inode *ip); | 53 | int gfs2_file_dealloc(struct gfs2_inode *ip); |
| 54 | int gfs2_write_alloc_required(struct gfs2_inode *ip, u64 offset, | 54 | int gfs2_write_alloc_required(struct gfs2_inode *ip, u64 offset, |
| 55 | unsigned int len, int *alloc_required); | 55 | unsigned int len); |
| 56 | 56 | ||
| 57 | #endif /* __BMAP_DOT_H__ */ | 57 | #endif /* __BMAP_DOT_H__ */ |