summaryrefslogtreecommitdiffstats
path: root/fs/ocfs2
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-07-28 14:22:25 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2016-07-28 14:22:25 -0700
commit69c4289449b954f87ce33904bbb1b27dc075dcfa (patch)
tree281d93b5b3d65e832e2fe8e7ff77d89a7de7539b /fs/ocfs2
parent76d5b28bbad1c5502a24f94c2beafc468690b2ba (diff)
parent34df117414d73cb56d128bf7016a4c151f95c313 (diff)
downloadlinux-stable-69c4289449b954f87ce33904bbb1b27dc075dcfa.tar.gz
linux-stable-69c4289449b954f87ce33904bbb1b27dc075dcfa.tar.bz2
linux-stable-69c4289449b954f87ce33904bbb1b27dc075dcfa.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree updates from Jiri Kosina. * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: fat: fix error message for bogus number of directory entries fat: fix typo s/supeblock/superblock/ ASoC: max9877: Remove unused function declaration dw2102: don't output spurious blank lines to the kernel log init: fix Kconfig text ARM: io: fix comment grammar ocfs: fix ocfs2_xattr_user_get() argument name scsi/qla2xxx: Remove erroneous unused macro qla82xx_get_temp_val1()
Diffstat (limited to 'fs/ocfs2')
-rw-r--r--fs/ocfs2/xattr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ocfs2/xattr.c b/fs/ocfs2/xattr.c
index d2053853951e..5bb44f7a78ee 100644
--- a/fs/ocfs2/xattr.c
+++ b/fs/ocfs2/xattr.c
@@ -7344,7 +7344,7 @@ const struct xattr_handler ocfs2_xattr_trusted_handler = {
* 'user' attributes support
*/
static int ocfs2_xattr_user_get(const struct xattr_handler *handler,
- struct dentry *unusde, struct inode *inode,
+ struct dentry *unused, struct inode *inode,
const char *name, void *buffer, size_t size)
{
struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);