diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-26 10:41:00 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-26 10:41:00 -0800 |
| commit | cc597bc3d31468596af6b8ad2b1d1b593e308957 (patch) | |
| tree | 303754908b583ff1da423bd37b56b01bd4585106 /include/linux | |
| parent | ed803862954528e6fcf7bd0f2b2e5a772a7c3281 (diff) | |
| parent | c475146d8f3b97e79f9ef88521e28ad40ac07de6 (diff) | |
| download | op-kernel-dev-cc597bc3d31468596af6b8ad2b1d1b593e308957.zip op-kernel-dev-cc597bc3d31468596af6b8ad2b1d1b593e308957.tar.gz | |
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-quota-2.6
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-quota-2.6:
ocfs2: Remove ocfs2_dquot_initialize() and ocfs2_dquot_drop()
quota: Improve locking
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/quotaops.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/quotaops.h b/include/linux/quotaops.h index 21b781a..0b35b3a 100644 --- a/include/linux/quotaops.h +++ b/include/linux/quotaops.h @@ -24,10 +24,8 @@ void sync_dquots(struct super_block *sb, int type); int dquot_initialize(struct inode *inode, int type); int dquot_drop(struct inode *inode); -int dquot_drop_locked(struct inode *inode); struct dquot *dqget(struct super_block *sb, unsigned int id, int type); void dqput(struct dquot *dquot); -int dquot_is_cached(struct super_block *sb, unsigned int id, int type); int dquot_scan_active(struct super_block *sb, int (*fn)(struct dquot *dquot, unsigned long priv), unsigned long priv); |
