diff options
| author | Dave Chinner <david@fromorbit.com> | 2015-01-22 09:20:53 +1100 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2015-01-22 09:20:53 +1100 |
| commit | 465e2def7cb45864da1f82afb973a6acd1046ed8 (patch) | |
| tree | d085a45f4575a8ea31d128626c4f1f650cf9d54a /fs/xfs/xfs_qm.h | |
| parent | 6bcf0939ff12464c7ea24c056826b8a26def9b06 (diff) | |
| parent | 074e427ba7f7398427e4f8e2aec071edcc509673 (diff) | |
| download | linux-465e2def7cb45864da1f82afb973a6acd1046ed8.tar.bz2 | |
Merge branch 'xfs-sb-logging-rework' into for-next
Conflicts:
fs/xfs/xfs_mount.c
Diffstat (limited to 'fs/xfs/xfs_qm.h')
| -rw-r--r-- | fs/xfs/xfs_qm.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/xfs/xfs_qm.h b/fs/xfs/xfs_qm.h index 3a07a937e232..d6e4d88094ab 100644 --- a/fs/xfs/xfs_qm.h +++ b/fs/xfs/xfs_qm.h @@ -157,7 +157,6 @@ struct xfs_dquot_acct { #define XFS_QM_RTBWARNLIMIT 5 extern void xfs_qm_destroy_quotainfo(struct xfs_mount *); -extern int xfs_qm_write_sb_changes(struct xfs_mount *, __int64_t); /* dquot stuff */ extern void xfs_qm_dqpurge_all(struct xfs_mount *, uint); |