From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 8 Jan 2011 01:16:27 +0000 (-0800)
Subject: Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hch/hfsplus
X-Git-Tag: v2.6.38-rc1~453
X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=0c21e3aaf6ae85bee804a325aa29c325209180fd;p=cascardo%2Flinux.git

Merge branch 'for-next' of git://git./linux/kernel/git/hch/hfsplus

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hch/hfsplus:
  hfsplus: %L-to-%ll, macro correction, and remove unneeded braces
  hfsplus: spaces/indentation clean-up
  hfsplus: C99 comments clean-up
  hfsplus: over 80 character lines clean-up
  hfsplus: fix an artifact in ioctl flag checking
  hfsplus: flush disk caches in sync and fsync
  hfsplus: optimize fsync
  hfsplus: split up inode flags
  hfsplus: write up fsync for directories
  hfsplus: simplify fsync
  hfsplus: avoid useless work in hfsplus_sync_fs
  hfsplus: make sure sync writes out all metadata
  hfsplus: use raw bio access for partition tables
  hfsplus: use raw bio access for the volume headers
  hfsplus: always use hfsplus_sync_fs to write the volume header
  hfsplus: silence a few debug printks
  hfsplus: fix option parsing during remount

Fix up conflicts due to VFS changes in fs/hfsplus/{hfsplus_fs.h,unicode.c}
---

0c21e3aaf6ae85bee804a325aa29c325209180fd
diff --cc fs/hfsplus/hfsplus_fs.h
index a5308f491e3e,f7cbdf89ac9b..d6857523336d
--- a/fs/hfsplus/hfsplus_fs.h
+++ b/fs/hfsplus/hfsplus_fs.h
@@@ -375,16 -418,17 +418,20 @@@ extern u16 hfsplus_decompose_table[]
  extern u16 hfsplus_compose_table[];
  
  /* unicode.c */
- int hfsplus_strcasecmp(const struct hfsplus_unistr *, const struct hfsplus_unistr *);
- int hfsplus_strcmp(const struct hfsplus_unistr *, const struct hfsplus_unistr *);
- int hfsplus_uni2asc(struct super_block *, const struct hfsplus_unistr *, char *, int *);
- int hfsplus_asc2uni(struct super_block *, struct hfsplus_unistr *, const char *, int);
- int hfsplus_hash_dentry(const struct dentry *dentry, const struct inode *inode,
- 		struct qstr *str);
+ int hfsplus_strcasecmp(const struct hfsplus_unistr *,
+ 		const struct hfsplus_unistr *);
+ int hfsplus_strcmp(const struct hfsplus_unistr *,
+ 		const struct hfsplus_unistr *);
+ int hfsplus_uni2asc(struct super_block *,
+ 		const struct hfsplus_unistr *, char *, int *);
+ int hfsplus_asc2uni(struct super_block *,
+ 		struct hfsplus_unistr *, const char *, int);
 -int hfsplus_hash_dentry(struct dentry *dentry, struct qstr *str);
 -int hfsplus_compare_dentry(struct dentry *dentry,
 -		struct qstr *s1, struct qstr *s2);
++int hfsplus_hash_dentry(const struct dentry *dentry,
++		const struct inode *inode, struct qstr *str);
 +int hfsplus_compare_dentry(const struct dentry *parent,
 +		const struct inode *pinode,
 +		const struct dentry *dentry, const struct inode *inode,
 +		unsigned int len, const char *str, const struct qstr *name);
  
  /* wrapper.c */
  int hfsplus_read_wrapper(struct super_block *);