diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-13 17:45:40 -0600 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-13 17:45:40 -0600 |
| commit | cec997093bbff881c3da49084dfba4f76361e96a (patch) | |
| tree | 7c84f8c30ceef7209a18d7cd216a3c16536008c5 /fs/quota/kqid.c | |
| parent | 8d2d441ac4af223eae466c3c31ff737cc31a1411 (diff) | |
| parent | 01777836c87081e4f68c4a43c9abe6114805f91e (diff) | |
| download | op-kernel-dev-cec997093bbff881c3da49084dfba4f76361e96a.zip op-kernel-dev-cec997093bbff881c3da49084dfba4f76361e96a.tar.gz | |
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
Pull quota, reiserfs, UDF updates from Jan Kara:
"Scalability improvements for quota, a few reiserfs fixes, and couple
of misc cleanups (udf, ext2)"
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
reiserfs: Fix use after free in journal teardown
reiserfs: fix corruption introduced by balance_leaf refactor
udf: avoid redundant memcpy when writing data in ICB
fs/udf: re-use hex_asc_upper_{hi,lo} macros
fs/quota: kernel-doc warning fixes
udf: use linux/uaccess.h
fs/ext2/super.c: Drop memory allocation cast
quota: remove dqptr_sem
quota: simplify remove_inode_dquot_ref()
quota: avoid unnecessary dqget()/dqput() calls
quota: protect Q_GETFMT by dqonoff_mutex
Diffstat (limited to 'fs/quota/kqid.c')
| -rw-r--r-- | fs/quota/kqid.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/quota/kqid.c b/fs/quota/kqid.c index 2f97b0e..ebc5e62 100644 --- a/fs/quota/kqid.c +++ b/fs/quota/kqid.c @@ -55,7 +55,7 @@ EXPORT_SYMBOL(qid_lt); /** * from_kqid - Create a qid from a kqid user-namespace pair. * @targ: The user namespace we want a qid in. - * @kuid: The kernel internal quota identifier to start with. + * @kqid: The kernel internal quota identifier to start with. * * Map @kqid into the user-namespace specified by @targ and * return the resulting qid. |
