linux-next: manual merge of the vfs-brauner tree with the ntfs3 tree

[Stephen Rothwell <sfr@canb.auug.org.au>]

[-- Attachment #1: Type: text/plain, Size: 1699 bytes --]

Hi all,

Today's linux-next merge of the vfs-brauner tree got a conflict in:

  fs/ntfs3/ntfs_fs.h

between commit:

  6be30a7aa20b ("fs/ntfs3: Remove cached label from sbi")

from the ntfs3 tree and commit:

  1a2af5ca9b66 ("ntfs3: enforce read-only when used as legacy ntfs driver")

from the vfs-brauner tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc fs/ntfs3/ntfs_fs.h
index 12c392db5b08,5f4d288c6adf..000000000000
--- a/fs/ntfs3/ntfs_fs.h
+++ b/fs/ntfs3/ntfs_fs.h
@@@ -1153,28 -1156,6 +1155,30 @@@ static inline void le64_sub_cpu(__le64 
  	*var = cpu_to_le64(le64_to_cpu(*var) - val);
  }
  
 +/*
 + * Attributes types: 0x10, 0x20, 0x30....
 + * indexes in attribute table:  0, 1, 2...
 + */
 +static inline const struct ATTR_DEF_ENTRY_SMALL *
 +ntfs_query_def(const struct ntfs_sb_info *sbi, enum ATTR_TYPE type)
 +{
 +	const struct ATTR_DEF_ENTRY_SMALL *q;
 +	u32 idx = (le32_to_cpu(type) >> 4) - 1;
 +
 +	if (idx >= sbi->attrdef.entries) {
 +		/* such attribute is not allowed in this ntfs. */
 +		return NULL;
 +	}
 +
 +	q = sbi->attrdef.table + idx;
 +	if (!q->type) {
 +		/* such attribute is not allowed in this ntfs. */
 +		return NULL;
 +	}
 +
 +	return q;
 +}
 +
+ bool is_legacy_ntfs(struct super_block *sb);
+ 
  #endif /* _LINUX_NTFS3_NTFS_FS_H */

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]