The patch titled
xdr annotations: NFS readdir entries
has been removed from the -mm tree. Its filename was
xdr-annotations-nfs-readdir-entries.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: xdr annotations: NFS readdir entries
From: Al Viro <viro@xxxxxxxxxxxxxxxx>
on-the-wire data is big-endian
[in large part pulled from Alexey's patch]
Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Acked-by: Trond Myklebust <trond.myklebust@xxxxxxxxxx>
Acked-by: Neil Brown <neilb@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
fs/nfs/dir.c | 6 +++---
fs/nfs/internal.h | 6 +++---
fs/nfs/nfs2xdr.c | 4 ++--
fs/nfs/nfs3xdr.c | 4 ++--
fs/nfs/nfs4_fs.h | 2 +-
fs/nfs/nfs4proc.c | 4 ++--
fs/nfs/nfs4xdr.c | 2 +-
include/linux/nfs_xdr.h | 2 +-
8 files changed, 15 insertions(+), 15 deletions(-)
diff -puN fs/nfs/dir.c~xdr-annotations-nfs-readdir-entries fs/nfs/dir.c
--- a/fs/nfs/dir.c~xdr-annotations-nfs-readdir-entries
+++ a/fs/nfs/dir.c
@@ -142,12 +142,12 @@ nfs_opendir(struct inode *inode, struct
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_descr
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);
diff -puN fs/nfs/internal.h~xdr-annotations-nfs-readdir-entries fs/nfs/internal.h
--- a/fs/nfs/internal.h~xdr-annotations-nfs-readdir-entries
+++ a/fs/nfs/internal.h
@@ -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 */
diff -puN fs/nfs/nfs2xdr.c~xdr-annotations-nfs-readdir-entries fs/nfs/nfs2xdr.c
--- a/fs/nfs/nfs2xdr.c~xdr-annotations-nfs-readdir-entries
+++ a/fs/nfs/nfs2xdr.c
@@ -468,8 +468,8 @@ err_unmap:
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)
diff -puN fs/nfs/nfs3xdr.c~xdr-annotations-nfs-readdir-entries fs/nfs/nfs3xdr.c
--- a/fs/nfs/nfs3xdr.c~xdr-annotations-nfs-readdir-entries
+++ a/fs/nfs/nfs3xdr.c
@@ -583,8 +583,8 @@ err_unmap:
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;
diff -puN fs/nfs/nfs4_fs.h~xdr-annotations-nfs-readdir-entries fs/nfs/nfs4_fs.h
--- a/fs/nfs/nfs4_fs.h~xdr-annotations-nfs-readdir-entries
+++ a/fs/nfs/nfs4_fs.h
@@ -212,7 +212,7 @@ extern void nfs_free_seqid(struct nfs_se
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;
diff -puN fs/nfs/nfs4proc.c~xdr-annotations-nfs-readdir-entries fs/nfs/nfs4proc.c
--- a/fs/nfs/nfs4proc.c~xdr-annotations-nfs-readdir-entries
+++ a/fs/nfs/nfs4proc.c
@@ -141,7 +141,7 @@ const u32 nfs4_fs_locations_bitmap[2] =
static void nfs4_setup_readdir(u64 cookie, u32 *verifier, struct dentry *dentry,
struct nfs4_readdir_arg *readdir)
{
- u32 *start, *p;
+ __be32 *start, *p;
BUG_ON(readdir->count < 80);
if (cookie > 2) {
@@ -162,7 +162,7 @@ static void nfs4_setup_readdir(u64 cooki
* when talking to the server, we always send cookie 0
* instead of 1 or 2.
*/
- start = p = (u32 *)kmap_atomic(*readdir->pages, KM_USER0);
+ start = p = kmap_atomic(*readdir->pages, KM_USER0);
if (cookie == 0) {
*p++ = xdr_one; /* next */
diff -puN fs/nfs/nfs4xdr.c~xdr-annotations-nfs-readdir-entries fs/nfs/nfs4xdr.c
--- a/fs/nfs/nfs4xdr.c~xdr-annotations-nfs-readdir-entries
+++ a/fs/nfs/nfs4xdr.c
@@ -4421,7 +4421,7 @@ out:
return status;
}
-uint32_t *nfs4_decode_dirent(uint32_t *p, struct nfs_entry *entry, int plus)
+__be32 *nfs4_decode_dirent(__be32 *p, struct nfs_entry *entry, int plus)
{
uint32_t bitmap[2] = {0};
uint32_t len;
diff -puN include/linux/nfs_xdr.h~xdr-annotations-nfs-readdir-entries include/linux/nfs_xdr.h
--- a/include/linux/nfs_xdr.h~xdr-annotations-nfs-readdir-entries
+++ a/include/linux/nfs_xdr.h
@@ -811,7 +811,7 @@ struct nfs_rpc_ops {
int (*pathconf) (struct nfs_server *, struct nfs_fh *,
struct nfs_pathconf *);
int (*set_capabilities)(struct nfs_server *, struct nfs_fh *);
- u32 * (*decode_dirent)(u32 *, struct nfs_entry *, int plus);
+ __be32 *(*decode_dirent)(__be32 *, struct nfs_entry *, int plus);
void (*read_setup) (struct nfs_read_data *);
int (*read_done) (struct rpc_task *, struct nfs_read_data *);
void (*write_setup) (struct nfs_write_data *, int how);
_
Patches currently in -mm which might be from viro@xxxxxxxxxxxxxxxx are
origin.patch
git-netdev-all.patch
slab-leaks3-default-y.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
