Commit 36ba76bb authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] Fix nfsctl for larger dev_t

From: Andries.Brouwer@cwi.nl

The old NFS control interface passes dev_t's in from userspace.  This patch
keeps it working when the size of dev_t changes.

This is a deprecated interface - new nfs-utils uses an ascii representation
in exportfs.

Acked by Neil.
parent f0d10803
...@@ -3040,7 +3040,6 @@ struct nfsctl_arg32 { ...@@ -3040,7 +3040,6 @@ struct nfsctl_arg32 {
#define ca32_svc u.u32_svc #define ca32_svc u.u32_svc
#define ca32_client u.u32_client #define ca32_client u.u32_client
#define ca32_export u.u32_export #define ca32_export u.u32_export
#define ca32_authd u.u32_authd
#define ca32_debug u.u32_debug #define ca32_debug u.u32_debug
}; };
......
...@@ -1131,7 +1131,7 @@ asmlinkage long sys32_msgrcv(int msqid, ...@@ -1131,7 +1131,7 @@ asmlinkage long sys32_msgrcv(int msqid,
struct nfsctl_export32 { struct nfsctl_export32 {
char ex_client[NFSCLNT_IDMAX+1]; char ex_client[NFSCLNT_IDMAX+1];
char ex_path[NFS_MAXPATHLEN+1]; char ex_path[NFS_MAXPATHLEN+1];
__kernel_dev_t ex_dev; __kernel_old_dev_t ex_dev;
compat_ino_t ex_ino; compat_ino_t ex_ino;
int ex_flags; int ex_flags;
__kernel_uid_t ex_anon_uid; __kernel_uid_t ex_anon_uid;
......
...@@ -910,7 +910,6 @@ struct nfsctl_arg32 { ...@@ -910,7 +910,6 @@ struct nfsctl_arg32 {
#define ca32_export u.u32_export #define ca32_export u.u32_export
#define ca32_getfd u.u32_getfd #define ca32_getfd u.u32_getfd
#define ca32_getfs u.u32_getfs #define ca32_getfs u.u32_getfs
#define ca32_authd u.u32_authd
}; };
union nfsctl_res32 { union nfsctl_res32 {
......
...@@ -2133,7 +2133,6 @@ struct nfsctl_arg32 { ...@@ -2133,7 +2133,6 @@ struct nfsctl_arg32 {
#define ca32_export u.u32_export #define ca32_export u.u32_export
#define ca32_getfd u.u32_getfd #define ca32_getfd u.u32_getfd
#define ca32_getfs u.u32_getfs #define ca32_getfs u.u32_getfs
#define ca32_authd u.u32_authd
}; };
union nfsctl_res32 { union nfsctl_res32 {
......
...@@ -1708,7 +1708,6 @@ struct nfsctl_arg32 { ...@@ -1708,7 +1708,6 @@ struct nfsctl_arg32 {
#define ca32_export u.u32_export #define ca32_export u.u32_export
#define ca32_getfd u.u32_getfd #define ca32_getfd u.u32_getfd
#define ca32_getfs u.u32_getfs #define ca32_getfs u.u32_getfs
#define ca32_authd u.u32_authd
}; };
union nfsctl_res32 { union nfsctl_res32 {
......
...@@ -59,7 +59,7 @@ struct nfsctl_client { ...@@ -59,7 +59,7 @@ struct nfsctl_client {
struct nfsctl_export { struct nfsctl_export {
char ex_client[NFSCLNT_IDMAX+1]; char ex_client[NFSCLNT_IDMAX+1];
char ex_path[NFS_MAXPATHLEN+1]; char ex_path[NFS_MAXPATHLEN+1];
__kernel_dev_t ex_dev; __kernel_old_dev_t ex_dev;
__kernel_ino_t ex_ino; __kernel_ino_t ex_ino;
int ex_flags; int ex_flags;
__kernel_uid_t ex_anon_uid; __kernel_uid_t ex_anon_uid;
...@@ -104,7 +104,6 @@ struct nfsctl_arg { ...@@ -104,7 +104,6 @@ struct nfsctl_arg {
#define ca_export u.u_export #define ca_export u.u_export
#define ca_getfd u.u_getfd #define ca_getfd u.u_getfd
#define ca_getfs u.u_getfs #define ca_getfs u.u_getfs
#define ca_authd u.u_authd
}; };
union nfsctl_res { union nfsctl_res {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment