diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-03 14:40:10 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-03 14:40:10 -0700 |
| commit | 3a09b1be53d23df780a0cd0e4087a05e2ca4a00c (patch) | |
| tree | 16c4ee5593847cc96e44e95f94e3ca0e315dfb1d /fs/gfs2/bmap.h | |
| parent | 7046e668d7973c470146fbe6635967a1b4a31bca (diff) | |
| parent | 0809f6ec18bbce54c996f5c36f4b9d371075c98b (diff) | |
| download | op-kernel-dev-3a09b1be53d23df780a0cd0e4087a05e2ca4a00c.zip op-kernel-dev-3a09b1be53d23df780a0cd0e4087a05e2ca4a00c.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw
* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw:
GFS2: Fix recovery stuck bug (try #2)
GFS2: Fix typo in stuffed file data copy handling
Revert "GFS2: recovery stuck on transaction lock"
GFS2: Make "try" lock not try quite so hard
GFS2: remove dependency on __GFP_NOFAIL
GFS2: Simplify gfs2_write_alloc_required
GFS2: Wait for journal id on mount if not specified on mount command line
GFS2: Use nobh_writepage
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 c983177..a20a521 100644 --- a/fs/gfs2/bmap.h +++ b/fs/gfs2/bmap.h @@ -52,6 +52,6 @@ int gfs2_truncatei(struct gfs2_inode *ip, u64 size); int gfs2_truncatei_resume(struct gfs2_inode *ip); int gfs2_file_dealloc(struct gfs2_inode *ip); int gfs2_write_alloc_required(struct gfs2_inode *ip, u64 offset, - unsigned int len, int *alloc_required); + unsigned int len); #endif /* __BMAP_DOT_H__ */ |
