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

Commit 0dbb4c67 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

[PATCH] xdr annotations: NFS readdir entries 



on-the-wire data is big-endian

[in large part pulled from Alexey's patch]

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Acked-by: default avatarTrond Myklebust <trond.myklebust@fys.uio.no>
Acked-by: default avatarNeil Brown <neilb@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 8687b63a

fs/nfs/dir.c

+3 −3
Original line number Diff line number Diff line
@@ -142,12 +142,12 @@ nfs_opendir(struct inode *inode, struct file *filp) 
	return res;

}



typedef u32 * (*decode_dirent_t)(u32 *, struct nfs_entry *, int);

typedef __be32 * (*decode_dirent_t)(__be32 *, struct nfs_entry *, int);

typedef struct {

	struct file	*file;

	struct page	*page;

	unsigned long	page_index;

	u32		*ptr;

	__be32		*ptr;

	u64		*dir_cookie;

	loff_t		current_index;

	struct nfs_entry *entry;
@@ -220,7 +220,7 @@ int nfs_readdir_filler(nfs_readdir_descriptor_t *desc, struct page *page) 
static inline

int dir_decode(nfs_readdir_descriptor_t *desc)

{

	u32	*p = desc->ptr;

	__be32	*p = desc->ptr;

	p = desc->decode(p, desc->entry, desc->plus);

	if (IS_ERR(p))

		return PTR_ERR(p);

fs/nfs/internal.h

+3 −3
Original line number Diff line number Diff line
@@ -93,15 +93,15 @@ extern void nfs_destroy_directcache(void); 
/* nfs2xdr.c */

extern int nfs_stat_to_errno(int);

extern struct rpc_procinfo nfs_procedures[];

extern u32 * nfs_decode_dirent(u32 *, struct nfs_entry *, int);

extern __be32 * nfs_decode_dirent(__be32 *, struct nfs_entry *, int);



/* nfs3xdr.c */

extern struct rpc_procinfo nfs3_procedures[];

extern u32 *nfs3_decode_dirent(u32 *, struct nfs_entry *, int);

extern __be32 *nfs3_decode_dirent(__be32 *, struct nfs_entry *, int);



/* nfs4xdr.c */

#ifdef CONFIG_NFS_V4

extern u32 *nfs4_decode_dirent(u32 *p, struct nfs_entry *entry, int plus);

extern __be32 *nfs4_decode_dirent(__be32 *p, struct nfs_entry *entry, int plus);

#endif



/* nfs4proc.c */

fs/nfs/nfs2xdr.c

+2 −2
Original line number Diff line number Diff line
@@ -468,8 +468,8 @@ nfs_xdr_readdirres(struct rpc_rqst *req, __be32 *p, void *dummy) 
	goto out;

}



u32 *

nfs_decode_dirent(u32 *p, struct nfs_entry *entry, int plus)

__be32 *

nfs_decode_dirent(__be32 *p, struct nfs_entry *entry, int plus)

{

	if (!*p++) {

		if (!*p)

fs/nfs/nfs3xdr.c

+2 −2
Original line number Diff line number Diff line
@@ -583,8 +583,8 @@ nfs3_xdr_readdirres(struct rpc_rqst *req, __be32 *p, struct nfs3_readdirres *res 
	goto out;

}



u32 *

nfs3_decode_dirent(u32 *p, struct nfs_entry *entry, int plus)

__be32 *

nfs3_decode_dirent(__be32 *p, struct nfs_entry *entry, int plus)

{

	struct nfs_entry old = *entry;

fs/nfs/nfs4_fs.h

+1 −1
Original line number Diff line number Diff line
@@ -212,7 +212,7 @@ extern void nfs_free_seqid(struct nfs_seqid *seqid); 
extern const nfs4_stateid zero_stateid;



/* nfs4xdr.c */

extern uint32_t *nfs4_decode_dirent(uint32_t *p, struct nfs_entry *entry, int plus);

extern __be32 *nfs4_decode_dirent(__be32 *p, struct nfs_entry *entry, int plus);

extern struct rpc_procinfo nfs4_procedures[];



struct nfs4_mount_data;