Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc26901b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'befs-v4.10-rc1' of git://github.com/luisbg/linux-befs 

Pull befs updates from Luis de Bethencourt:
 "A series of small fixes and adding NFS export support"

* tag 'befs-v4.10-rc1' of git://github.com/luisbg/linux-befs:
  befs: add NFS export support
  befs: remove trailing whitespaces
  befs: remove signatures from comments
  befs: fix style issues in header files
  befs: fix style issues in linuxvfs.c
  befs: fix typos in linuxvfs.c
  befs: fix style issues in io.c
  befs: fix style issues in inode.c
  befs: fix style issues in debug.c
parents 01302aac ac632f5b

fs/befs/befs.h

+2 −1
Original line number Diff line number Diff line
@@ -129,6 +129,7 @@ static inline befs_inode_addr 
blockno2iaddr(struct super_block *sb, befs_blocknr_t blockno)

{

	befs_inode_addr iaddr;



	iaddr.allocation_group = blockno >> BEFS_SB(sb)->ag_shift;

	iaddr.start =

	    blockno - (iaddr.allocation_group << BEFS_SB(sb)->ag_shift);

fs/befs/befs_fs_types.h

+6 −6
Original line number Diff line number Diff line
@@ -55,12 +55,12 @@ enum super_flags { 
};



#define BEFS_BYTEORDER_NATIVE 0x42494745

#define BEFS_BYTEORDER_NATIVE_LE (__force fs32)cpu_to_le32(BEFS_BYTEORDER_NATIVE)

#define BEFS_BYTEORDER_NATIVE_BE (__force fs32)cpu_to_be32(BEFS_BYTEORDER_NATIVE)

#define BEFS_BYTEORDER_NATIVE_LE ((__force fs32)cpu_to_le32(BEFS_BYTEORDER_NATIVE))

#define BEFS_BYTEORDER_NATIVE_BE ((__force fs32)cpu_to_be32(BEFS_BYTEORDER_NATIVE))



#define BEFS_SUPER_MAGIC BEFS_SUPER_MAGIC1

#define BEFS_SUPER_MAGIC1_LE (__force fs32)cpu_to_le32(BEFS_SUPER_MAGIC1)

#define BEFS_SUPER_MAGIC1_BE (__force fs32)cpu_to_be32(BEFS_SUPER_MAGIC1)

#define BEFS_SUPER_MAGIC1_LE ((__force fs32)cpu_to_le32(BEFS_SUPER_MAGIC1))

#define BEFS_SUPER_MAGIC1_BE ((__force fs32)cpu_to_be32(BEFS_SUPER_MAGIC1))



/*

 * Flags of inode

fs/befs/btree.h

+3 −5
Original line number Diff line number Diff line
@@ -3,11 +3,9 @@ 
 *

 */





int befs_btree_find(struct super_block *sb, const befs_data_stream *ds,

		    const char *key, befs_off_t *value);



int befs_btree_read(struct super_block *sb, const befs_data_stream *ds,

		    loff_t key_no, size_t bufsize, char *keybuf,

		    size_t *keysize, befs_off_t *value);

fs/befs/datastream.c

+3 −5
Original line number Diff line number Diff line
@@ -89,8 +89,6 @@ befs_read_datastream(struct super_block *sb, const befs_data_stream *ds, 
 *

 * Calls specialized functions for each of the three possible

 * datastream regions.

 *

 * 2001-11-15 Will Dyson

 */

int

befs_fblock2brun(struct super_block *sb, const befs_data_stream *data,

fs/befs/datastream.h

+2 −3
Original line number Diff line number Diff line
@@ -17,4 +17,3 @@ befs_blocknr_t befs_count_blocks(struct super_block *sb, 
			  const befs_data_stream *ds);



extern const befs_inode_addr BAD_IADDR;