diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-01-07 21:53:13 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-01-07 21:53:13 +0100 |
commit | 23c4c1c7b0dd2ebeb90bb6851478c0e80fe9e6b8 (patch) | |
tree | 60ab5e96f1e6e0ddd46eadf34d8a83ae2d8db72a /fs/xfs/xfs_sync.h | |
parent | Merge branch 'tegra/soc' into next/soc (diff) | |
parent | Merge branch 'restart' into for-linus (diff) | |
download | linux-23c4c1c7b0dd2ebeb90bb6851478c0e80fe9e6b8.tar.xz linux-23c4c1c7b0dd2ebeb90bb6851478c0e80fe9e6b8.zip |
Merge branch 'depends/rmk/for-linus' into next/soc
Conflicts:
arch/arm/mach-tegra/board-dt-tegra20.c
arch/arm/mach-tegra/common.c
Diffstat (limited to 'fs/xfs/xfs_sync.h')
-rw-r--r-- | fs/xfs/xfs_sync.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/xfs/xfs_sync.h b/fs/xfs/xfs_sync.h index 941202e7ac6e..fa965479d788 100644 --- a/fs/xfs/xfs_sync.h +++ b/fs/xfs/xfs_sync.h @@ -34,6 +34,8 @@ void xfs_quiesce_attr(struct xfs_mount *mp); void xfs_flush_inodes(struct xfs_inode *ip); +int xfs_log_dirty_inode(struct xfs_inode *ip, struct xfs_perag *pag, int flags); + int xfs_reclaim_inodes(struct xfs_mount *mp, int mode); int xfs_reclaim_inodes_count(struct xfs_mount *mp); void xfs_reclaim_inodes_nr(struct xfs_mount *mp, int nr_to_scan); |