diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-03 08:48:21 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-03 08:48:21 -0700 |
commit | eb0ad9c06d51edb5d18a7007fd4d77a8805b2ba7 (patch) | |
tree | 987595aa0cfa6e9fdf367a1ec3f5e8b04849c777 /fs/jfs/jfs_dmap.h | |
parent | 1f7df953d687860690cc0e388d0efec215c09e9c (diff) | |
parent | 84f4141ee3ea11035f741d4298cb6bbad1850fcf (diff) |
Merge tag 'jfs-3.7' of git://github.com/kleikamp/linux-shaggy
Pull JFS update from Dave Kleikamp:
"JFS TRIM support and some minor fixes"
* tag 'jfs-3.7' of git://github.com/kleikamp/linux-shaggy:
jfs: Fix do_div precision in commit b40c2e66
JFS: use list_move instead of list_del/list_add
jfs: Remove obsolete email address
fs/jfs: TRIM support for JFS Filesystem
Diffstat (limited to 'fs/jfs/jfs_dmap.h')
-rw-r--r-- | fs/jfs/jfs_dmap.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/jfs/jfs_dmap.h b/fs/jfs/jfs_dmap.h index 6dcb906c55d..562b9a7e431 100644 --- a/fs/jfs/jfs_dmap.h +++ b/fs/jfs/jfs_dmap.h @@ -311,4 +311,6 @@ extern int dbAllocBottomUp(struct inode *ip, s64 blkno, s64 nblocks); extern int dbExtendFS(struct inode *ipbmap, s64 blkno, s64 nblocks); extern void dbFinalizeBmap(struct inode *ipbmap); extern s64 dbMapFileSizeToMapSize(struct inode *ipbmap); +extern s64 dbDiscardAG(struct inode *ip, int agno, s64 minlen); + #endif /* _H_JFS_DMAP */ |