Ocfs2: Add new OCFS2_IOC_INFO ioctl for ocfs2 v7.
PATCH 1/1 Ocfs2: Add new OCFS2_IOC_INFO ioctl for ocfs2 v7.
The reason why we need this ioctl is to offer the none-privileged end-user a possibility to get filesys info gathering.
We use OCFS2_IOC_INFO to manipulate the new ioctl, userspace passes a structure to kernel containing an array of request pointers and request count, such as,
* From userspace:
struct ocfs2_info_blocksize oib = {
.ib_req = {
.ir_magic = OCFS2_INFO_MAGIC,
.ir_code = OCFS2_INFO_BLOCKSIZE,
...
}
...
}struct ocfs2_info_clustersize oic = {
...
}uint64_t reqs[2] = {(unsigned long)&oib,
(unsigned long)&oic};
struct ocfs2_info info = {
.oi_requests = reqs,
.oi_count = 2,
}
ret = ioctl(fd, OCFS2_IOC_INFO, &info);
* In kernel:
Get the request pointers from *info*, then handle each request one bye one.
Idea here is to make the spearated request small enough to guarantee a better backward&forward compatibility since a small piece of request would be less likely to be broken if filesys on raw disk get changed.
Currently, the following 7 requests are supported per the requirement from userspace tool o2info, and I believe it will grow over time:-)
OCFS2_INFO_CLUSTERSIZE
OCFS2_INFO_BLOCKSIZE
OCFS2_INFO_MAXSLOTS
OCFS2_INFO_LABEL
OCFS2_INFO_UUID
OCFS2_INFO_FS_FEATURES
OCFS2_INFO_JOURNAL_SIZE
This ioctl is only specific to OCFS2.
--- fs/ocfs2/ioctl.c | 340 ++++++++++++++++++++++++++++++++++++++++++++++++ fs/ocfs2/ocfs2_ioctl.h | 90 +++++++++++++ 2 files changed, 430 insertions(+), 0 deletions(-)
fs/ocfs2/ioctl.c +340 -0
@@ -23,8 +23,33 @@#include "ioctl.h" #include "resize.h" #include "refcounttree.h" +#include "sysfile.h" +#include "buffer_head_io.h" +#include "suballoc.h" +#include <linux/ext2_fs.h> +#include <linux/compat.h> + +#define o2info_from_user (a, b) \ + copy_from_user(&(a), (b), sizeof(a)) +#define o2info_to_user (a, b) \ + copy_to_user((typeof(a) __user *)b, &(a), sizeof(a)) + +/* +* This call is void because we are already reporting an error that may +* be -EFAULT. The error will be returned from the ioctl(2) call. It's +* just a best-effort to tell userspace that this request caused the error. +*/ +static inline void __o2info_set_request_error (struct ocfs2_info_request *kreq, +struct ocfs2_info_request __user *req) +{ + kreq->ir_flags |=OCFS2_INFO_FL_ERROR ; + (void )put_user (kreq->ir_flags, (__u32 __user *)&(req->ir_flags)); +} + +#define o2info_set_request_error (a, b) \ + __o2info_set_request_error((struct ocfs2_info_request *)&(a), b)static int ocfs2_get_inode_attr (struct inode *inode,unsigned *flags) {
@@ -109,6 +134,307 @@ bail:return status; } +int ocfs2_info_handle_blocksize (struct inode *inode, +struct ocfs2_info_request __user *req) +{ +int status = -EFAULT ; +struct ocfs2_info_blocksize oib; + +if (o2info_from_user (oib, req)) + goto bail; + + oib.ib_blocksize = inode->i_sb->s_blocksize; + oib.ib_req.ir_flags |=OCFS2_INFO_FL_FILLED ; + +if (o2info_to_user (oib, req)) + goto bail; + + status =0 ; +bail: +if (status) +o2info_set_request_error (oib, req); + +return status; +} + +int ocfs2_info_handle_clustersize (struct inode *inode, +struct ocfs2_info_request __user *req) +{ +int status = -EFAULT ; +struct ocfs2_info_clustersize oic; +struct ocfs2_super *osb =OCFS2_SB (inode->i_sb); + +if (o2info_from_user (oic, req)) + goto bail; + + oic.ic_clustersize = osb->s_clustersize; + oic.ic_req.ir_flags |=OCFS2_INFO_FL_FILLED ; + +if (o2info_to_user (oic, req)) + goto bail; + + status =0 ; +bail: +if (status) +o2info_set_request_error (oic, req); + +return status; +} + +int ocfs2_info_handle_maxslots (struct inode *inode, +struct ocfs2_info_request __user *req) +{ +int status = -EFAULT ; +struct ocfs2_info_maxslots oim; +struct ocfs2_super *osb =OCFS2_SB (inode->i_sb); + +if (o2info_from_user (oim, req)) + goto bail; + + oim.im_max_slots = osb->max_slots; + oim.im_req.ir_flags |=OCFS2_INFO_FL_FILLED ; + +if (o2info_to_user (oim, req)) + goto bail; + + status =0 ; +bail: +if (status) +o2info_set_request_error (oim, req); + +return status; +} + +int ocfs2_info_handle_label (struct inode *inode, +struct ocfs2_info_request __user *req) +{ +int status = -EFAULT ; +struct ocfs2_info_label oil; +struct ocfs2_super *osb =OCFS2_SB (inode->i_sb); + +if (o2info_from_user (oil, req)) + goto bail; + +memcpy (oil.il_label, osb->vol_label,OCFS2_MAX_VOL_LABEL_LEN ); + oil.il_req.ir_flags |=OCFS2_INFO_FL_FILLED ; + +if (o2info_to_user (oil, req)) + goto bail; + + status =0 ; +bail: +if (status) +o2info_set_request_error (oil, req); + +return status; +} + +int ocfs2_info_handle_uuid (struct inode *inode, +struct ocfs2_info_request __user *req) +{ +int status = -EFAULT ; +struct ocfs2_info_uuid oiu; +struct ocfs2_super *osb =OCFS2_SB (inode->i_sb); + +if (o2info_from_user (oiu, req)) + goto bail; + +memcpy (oiu.iu_uuid_str, osb->uuid_str,OCFS2_TEXT_UUID_LEN +1 ); + oiu.iu_req.ir_flags |=OCFS2_INFO_FL_FILLED ; + +if (o2info_to_user (oiu, req)) + goto bail; + + status =0 ; +bail: +if (status) +o2info_set_request_error (oiu, req); + +return status; +} + +int ocfs2_info_handle_fs_features (struct inode *inode, +struct ocfs2_info_request __user *req) +{ +int status = -EFAULT ; +struct ocfs2_info_fs_features oif; +struct ocfs2_super *osb =OCFS2_SB (inode->i_sb); + +if (o2info_from_user (oif, req)) + goto bail; + + oif.if_compat_features = osb->s_feature_compat; + oif.if_incompat_features = osb->s_feature_incompat; + oif.if_ro_compat_features = osb->s_feature_ro_compat; + oif.if_req.ir_flags |=OCFS2_INFO_FL_FILLED ; + +if (o2info_to_user (oif, req)) + goto bail; + + status =0 ; +bail: +if (status) +o2info_set_request_error (oif, req); + +return status; +} + +int ocfs2_info_handle_journal_size (struct inode *inode, +struct ocfs2_info_request __user *req) +{ +int status = -EFAULT ; +struct ocfs2_info_journal_size oij; +struct ocfs2_super *osb =OCFS2_SB (inode->i_sb); + +if (o2info_from_user (oij, req)) + goto bail; + + oij.ij_journal_size = osb->journal->j_inode->i_size; + + oij.ij_req.ir_flags |=OCFS2_INFO_FL_FILLED ; + +if (o2info_to_user (oij, req)) + goto bail; + + status =0 ; +bail: +if (status) +o2info_set_request_error (oij, req); + +return status; +} + +int ocfs2_info_handle_unknown (struct inode *inode, +struct ocfs2_info_request __user *req) +{ +int status = -EFAULT ; +struct ocfs2_info_request oir; + +if (o2info_from_user (oir, req)) + goto bail; + + oir.ir_flags &= ~OCFS2_INFO_FL_FILLED ; + +if (o2info_to_user (oir, req)) + goto bail; + + status =0 ; +bail: +if (status) +o2info_set_request_error (oir, req); + +return status; +} + +/* +* Validate and distinguish OCFS2_IOC_INFO requests. +* +* - validate the magic number. +* - distinguish different requests. +* - validate size of different requests. +*/ +int ocfs2_info_handle_request (struct inode *inode, +struct ocfs2_info_request __user *req) +{ +int status = -EFAULT ; +struct ocfs2_info_request oir; + +if (o2info_from_user (oir, req)) + goto bail; + + status = -EINVAL ; +if (oir.ir_magic !=OCFS2_INFO_MAGIC ) + goto bail; + +switch (oir.ir_code) { +case OCFS2_INFO_BLOCKSIZE : +if (oir.ir_size ==sizeof (struct ocfs2_info_blocksize )) + status =ocfs2_info_handle_blocksize (inode, req); +break ; +case OCFS2_INFO_CLUSTERSIZE : +if (oir.ir_size ==sizeof (struct ocfs2_info_clustersize )) + status =ocfs2_info_handle_clustersize (inode, req); +break ; +case OCFS2_INFO_MAXSLOTS : +if (oir.ir_size ==sizeof (struct ocfs2_info_maxslots )) + status =ocfs2_info_handle_maxslots (inode, req); +break ; +case OCFS2_INFO_LABEL : +if (oir.ir_size ==sizeof (struct ocfs2_info_label )) + status =ocfs2_info_handle_label (inode, req); +break ; +case OCFS2_INFO_UUID : +if (oir.ir_size ==sizeof (struct ocfs2_info_uuid )) + status =ocfs2_info_handle_uuid (inode, req); +break ; +case OCFS2_INFO_FS_FEATURES : +if (oir.ir_size ==sizeof (struct ocfs2_info_fs_features )) + status =ocfs2_info_handle_fs_features (inode, req); +break ; +case OCFS2_INFO_JOURNAL_SIZE : +if (oir.ir_size ==sizeof (struct ocfs2_info_journal_size )) + status =ocfs2_info_handle_journal_size (inode, req); +break ; +default : + status =ocfs2_info_handle_unknown (inode, req); +break ; + } + +bail: +return status; +} + +/* +* OCFS2_IOC_INFO handles an array of requests passed from userspace. +* +* ocfs2_info_handle() recevies a large info aggregation, grab and +* validate the request count from header, then break it into small +* pieces, later specific handlers can handle them one by one. +* +* Idea here is to make each separate request small enough to ensure +* a better backward&forward compatibility, since a small piece of +* request will be less likely to be broken if disk layout get changed. +*/ +int ocfs2_info_handle (struct inode *inode,struct ocfs2_info *info, +int compat_flag) +{ +int i, status =0 ; +u64 req_addr; +struct ocfs2_info_request __user *reqp; + +if ((info->oi_count >OCFS2_INFO_MAX_REQUEST ) || + (!info->oi_requests)) { + status = -EINVAL ; + goto bail; + } + +for (i =0 ; i < info->oi_count; i++) { + status = -EFAULT ; +if (compat_flag) { +if (get_user (req_addr, + (u64 __user *)compat_ptr (info->oi_requests) + i)) + goto bail; + }else { +if (get_user (req_addr, + (u64 __user *)(info->oi_requests) + i)) + goto bail; + } + + reqp = (struct ocfs2_info_request *)req_addr; +if (!reqp) { + status = -EINVAL ; + goto bail; + } + + status =ocfs2_info_handle_request (inode, reqp); +if (status) +break ; + } + +bail: +return status; +} +long ocfs2_ioctl (struct file *filp,unsigned int cmd,unsigned long arg) {struct inode *inode = filp->f_path.dentry->d_inode;
@@ -120,6 +446,7 @@ long ocfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)struct reflink_arguments args;const char *old_path, *new_path;bool preserve; +struct ocfs2_info info;switch (cmd) {case OCFS2_IOC_GETFLAGS :
@@ -174,6 +501,12 @@ long ocfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) preserve = (args.preserve !=0 );return ocfs2_reflink_ioctl (inode, old_path, new_path, preserve); +case OCFS2_IOC_INFO : +if (copy_from_user (&info, (struct ocfs2_info __user *)arg, +sizeof (struct ocfs2_info ))) +return -EFAULT ; + +return ocfs2_info_handle (inode, &info,0 );default :return -ENOTTY ; }
@@ -185,6 +518,7 @@ long ocfs2_compat_ioctl(struct file *file, unsigned cmd, unsigned long arg)bool preserve;struct reflink_arguments args;struct inode *inode = file->f_path.dentry->d_inode; +struct ocfs2_info info;switch (cmd) {case OCFS2_IOC32_GETFLAGS :
@@ -209,6 +543,12 @@ long ocfs2_compat_ioctl(struct file *file, unsigned cmd, unsigned long arg)return ocfs2_reflink_ioctl (inode,compat_ptr (args.old_path),compat_ptr (args.new_path), preserve); +case OCFS2_IOC_INFO : +if (copy_from_user (&info, (struct ocfs2_info __user *)arg, +sizeof (struct ocfs2_info ))) +return -EFAULT ; + +return ocfs2_info_handle (inode, &info,1 );default :return -ENOIOCTLCMD ; }
fs/ocfs2/ocfs2_ioctl.h +90 -0
94 lines not on this page · raw message
Signature · 1 line
1.5.5
PATCH 1/1 Ocfs2: Add new OCFS2_IOC_INFO ioctl for ocfs2 v7.
Quoted 6 lines · Tristan Ye
The reason why we need this ioctl is to offer the none-privileged end-user a possibility to get filesys info gathering.
We use
OCFS2_IOC_INFOto manipulate the new ioctl, userspace passes a structure to kernel containing an array of request pointers and request count, such as,
This patch fails to build in ia32. Have you tested it there?
Details below.
Quoted 5 lines
fs/ocfs2/ioctl.c +0
-0
fs/ocfs2/ioctl.c line 32
Quoted 10 lines
fs/ocfs2/ioctl.c +5
-0@@ -23,8 +23,33 @@#include "ioctl.h" #include "resize.h" #include "refcounttree.h" +#include "sysfile.h" +#include "buffer_head_io.h" +#include "suballoc.h" +#include <linux/ext2_fs.h> +#include <linux/compat.h>
First off, linux/compat.h is already included as the third
include of ioctl.c. Why are you including it again?
Quoted 9 lines
fs/ocfs2/ioctl.c +9
-0+int ocfs2_info_handle (struct inode *inode,struct ocfs2_info *info, +int compat_flag) +{ +int i, status =0 ; +u64 req_addr; +struct ocfs2_info_request __user *reqp; + +if ((info->oi_count >OCFS2_INFO_MAX_REQUEST ) || + (!info->oi_requests)) {
fs/ocfs2/ioctl.c bail: · line 416
Quoted 10 lines
fs/ocfs2/ioctl.c +10
-0+ status = -EINVAL ; + goto bail; + } + +for (i =0 ; i < info->oi_count; i++) { + status = -EFAULT ; +if (compat_flag) { +if (get_user (req_addr, + (u64 __user *)compat_ptr (info->oi_requests) + i)) + goto bail;
The specific compile errors I am getting are:
/build/jlbec/linux-2.6/working/fs/ocfs2/ioctl.c: In function ?ocfs2_info_handle?:
/build/jlbec/linux-2.6/working/fs/ocfs2/ioctl.c:414: error: implicit declaration of function ?compat_ptr?
and:
fs/ocfs2/ioctl.c bail: · line 420
Quoted 4 lines
fs/ocfs2/ioctl.c +4
-0+ }else { +if (get_user (req_addr, + (u64 __user *)(info->oi_requests) + i)) + goto bail;
/build/jlbec/linux-2.6/working/fs/ocfs2/ioctl.c:418: warning: cast to pointer from integer of different size
The reason you are getting "implicit declaration of function
'compat_ptr' is because it only exists when CONFIG_COMPAT is defined. CONFIG_COMPAT cannot exist on ia32 or any other 32-bit platform.
I say you should define a function "ocfs2_get_request_ptr()"
that wraps both the comapt and non-compat get_user() calls. Inside that function, you should have:
if (compat_flag) {
#ifdef CONFIG_COMPAT
if (get_user(...compat_ptr...))
goto bail;
#else
BUG();
#endif
} else {
That way the info_handle() function isn't polluted by the ifdef.Joel
Signature · 9 lines
Life's Little Instruction Book #109 "Know how to drive a stick shift." Joel Becker Principal Software Developer Oracle E-mail: joel.becker at oracle.com Phone: (650) 506-8127
PATCH 1/1 Ocfs2: Add new OCFS2_IOC_INFO ioctl for ocfs2 v7.
Quoted 9 lines · Joel Becker
Quoted 6 lines · Tristan Ye
The reason why we need this ioctl is to offer the none-privileged end-user a possibility to get filesys info gathering.
We use
OCFS2_IOC_INFOto manipulate the new ioctl, userspace passes a structure to kernel containing an array of request pointers and request count, such as,This patch fails to build in ia32. Have you tested it there?
I'll be clearer for future reference. Anyone adding or
modifying code that handles compat pointers needs to compile and test:
1) A 32bit user program on a 32bit OS.
2) A 32bit user program on a 64bit OS with CONFIG_COMPAT set.
3) A 64bit user program on a 64bit OS with CONFIG_COMPAT set.
4) A 32bit user program on a 64bit OS with CONFIG_COMPAT *not* set.
5) A 64bit user program on a 64bit OS with CONFIG_COMPAT *not* set.
Only test (4) should return an error.
I realize this is a lot of testing, but it only needs to be done
once. It's only when you are actually touching CONFIG_COMPAT stuff.
Joel
Signature · 8 lines
"Hey mister if you're gonna walk on water, Could you drop a line my way?" Joel Becker Principal Software Developer Oracle E-mail: joel.becker at oracle.com Phone: (650) 506-8127
PATCH 1/1 Ocfs2: Add new OCFS2_IOC_INFO ioctl for ocfs2 v7.
Quoted 19 lines · Joel Becker
Quoted 8 lines · Joel Becker
Quoted 6 lines · Tristan Ye
The reason why we need this ioctl is to offer the none-privileged end-user a possibility to get filesys info gathering.
We use
OCFS2_IOC_INFOto manipulate the new ioctl, userspace passes a structure to kernel containing an array of request pointers and request count, such as,This patch fails to build in ia32. Have you tested it there?
I'll be clearer for future reference. Anyone adding or
modifying code that handles compat pointers needs to compile and test:1) A 32bit user program on a 32bit OS.
2) A 32bit user program on a 64bit OS withCONFIG_COMPATset.
3) A 64bit user program on a 64bit OS withCONFIG_COMPATset.
4) A 32bit user program on a 64bit OS withCONFIG_COMPAT*not* set.
5) A 64bit user program on a 64bit OS withCONFIG_COMPAT*not* set.
Quoted 3 lines
Only test (4) should return an error.
I realize this is a lot of testing, but it only needs to be done
once. It's only when you are actually touchingCONFIG_COMPATstuff.
That's definitely a MUST!! since I caught another bug running 32bits application on 64bits kernel, the problem is I didn't make the 'ocfs2_info' structure 64bits aligned, which caused a failure to recognize this ioctl from a 32bits application. Following is all that I'm going to change against this issue:
--------------------------------------------------------------------------
struct ocfs2_info {__u64 oi_requests; /* Array of __u64 pointers to requests */
- __u32 oi_count; /* Number of requests in info_requests */
+ __u64 oi_count; /* Number of requests in info_requests */ };
struct ocfs2_info_request {
@@ -102,34 +102,34 @@ struct ocfs2_info_request {
struct ocfs2_info_clustersize {
struct ocfs2_info_request ic_req;
- __u32 ic_clustersize;
+ __u64 ic_clustersize;
};
struct ocfs2_info_blocksize {
struct ocfs2_info_request ib_req;
- __u32 ib_blocksize;
+ __u64 ib_blocksize;
};
struct ocfs2_info_maxslots {
struct ocfs2_info_request im_req;
- __u16 im_max_slots;
+ __u64 im_max_slots;
};
struct ocfs2_info_label {
struct ocfs2_info_request il_req;__u8 il_label[OCFS2_MAX_VOL_LABEL_LEN];
-};
+} __attribute__ ((packed));
struct ocfs2_info_uuid {
struct ocfs2_info_request iu_req;__u8 iu_uuid_str[OCFS2_TEXT_UUID_LEN + 1];
-};
+} __attribute__ ((packed));
struct ocfs2_info_fs_features {
struct ocfs2_info_request if_req;
- __u32 if_compat_features;
- __u32 if_incompat_features;
- __u32 if_ro_compat_features;
+ __u64 if_compat_features;
+ __u64 if_incompat_features;
+ __u64 if_ro_compat_features;
};
--------------------------------------------------------------------------
Adding 'packed' attribute also solves the problem as well, that's why I made this for ocfs2_info_label and ocfs2_info_uuid to avoid quite a redundant expansion.
Eventually my latest patch passes all 1-5 tests(bug out at test 4) as expected, and I'll post it soon ;-)
Tristan.
Quoted 3 lines
Joel
PATCH 1/1 Ocfs2: Add new OCFS2_IOC_INFO ioctl for ocfs2 v7.
Quoted 6 lines · tristan
That's definitely a MUST!! since I caught another bug running 32bits application on 64bits kernel, the problem is I didn't make the '
ocfs2_info' structure 64bits aligned, which caused a failure to recognize this ioctl from a 32bits application. Following is all that I'm going to change against this issue:
Quoted 6 lines
--------------------------------------------------------------------------
structocfs2_info{__u64oi_requests; /* Array of__u64pointers to requests */
-__u32oi_count; /* Number of requests ininfo_requests*/
+__u64oi_count; /* Number of requests ininfo_requests*/ };
Don't turn these values into 64bit ones. Instead, pad the
structure:
struct ocfs2_info {
__u64 oi_requests;
__u32 oi_count;
__u32 oi_pad;
};That way you can change the structure later to use the pad field without breaking old code.
Joel
Signature · 9 lines
"Any man who is under 30, and is not a liberal, has not heart;
and any man who is over 30, and is not a conservative, has no brains."
- Sir Winston Churchill
Joel Becker
Principal Software Developer
Oracle
E-mail: joel.becker at oracle.com
Phone: (650) 506-8127PATCH 1/1 Ocfs2: Add new OCFS2_IOC_INFO ioctl for ocfs2 v7.
In reply to Joel BeckerQuoted 24 lines · Joel Becker
Quoted 6 lines · Tristan Ye
The reason why we need this ioctl is to offer the none-privileged end-user a possibility to get filesys info gathering.
We use
OCFS2_IOC_INFOto manipulate the new ioctl, userspace passes a structure to kernel containing an array of request pointers and request count, such as,This patch fails to build in ia32. Have you tested it there?
Details below.Quoted 13 lines
fs/ocfs2/ioctl.c +4
-0@@ -23,8 +23,33 @@#include "ioctl.h" #include "resize.h" #include "refcounttree.h" +#include "sysfile.h" +#include "buffer_head_io.h" +#include "suballoc.h" +
Quoted 6 lines
fs/ocfs2/ioctl.c line 32
Quoted 2 lines
fs/ocfs2/ioctl.c +1
-0#include <linux/ext2_fs.h> +#include <linux/compat.h> First off,
linux/compat.his already included as the third
include ofioctl.c. Why are you including it again?
Oh, that's true, why I'm so blind...
Quoted 22 lines
Quoted 9 lines
fs/ocfs2/ioctl.c +9
-0+int ocfs2_info_handle (struct inode *inode,struct ocfs2_info *info, +int compat_flag) +{ +int i, status =0 ; +u64 req_addr; +struct ocfs2_info_request __user *reqp; + +if ((info->oi_count >OCFS2_INFO_MAX_REQUEST ) || + (!info->oi_requests)) {fs/ocfs2/ioctl.c bail: · line 416
Quoted 10 lines
fs/ocfs2/ioctl.c +10
-0+ status = -EINVAL ; + goto bail; + } + +for (i =0 ; i < info->oi_count; i++) { + status = -EFAULT ; +if (compat_flag) { +if (get_user (req_addr, + (u64 __user *)compat_ptr (info->oi_requests) + i)) + goto bail;The specific compile errors I am getting are:
Quoted 5 lines
/build/jlbec/linux-2.6/working/fs/ocfs2/ioctl.c: In function ?ocfs2_info_handle?:
/build/jlbec/linux-2.6/working/fs/ocfs2/ioctl.c:414: error: implicit declaration of function ?compat_ptr?and:
Joel, thanks for pointing this out, it's a big defect here, I just tested under ppc/x86_64/i386.
Have not tried on ia64 yet... that's totally my mistake...
Quoted 26 lines
fs/ocfs2/ioctl.c bail: · line 420
Quoted 4 lines
fs/ocfs2/ioctl.c +4
-0+ }else { +if (get_user (req_addr, + (u64 __user *)(info->oi_requests) + i)) + goto bail;/build/jlbec/linux-2.6/working/fs/ocfs2/ioctl.c:418: warning: cast to pointer from integer of different size
The reason you are getting "implicit declaration of function
'compat_ptr' is because it only exists whenCONFIG_COMPATis defined.CONFIG_COMPATcannot exist on ia32 or any other 32-bit platform.
I say you should define a function "ocfs2_get_request_ptr()"
that wraps both the comapt and non-compatget_user()calls. Inside that function, you should have:if (compat_flag) { #ifdef CONFIG_COMPAT if (get_user(...compat_ptr...)) goto bail; #else BUG(); #endif } else { That way the info_handle() function isn't polluted by the ifdef.Joel
PATCH 1/1 Ocfs2: Add new OCFS2_IOC_INFO ioctl for ocfs2 v7.
Quoted 6 lines · tristan
Quoted 5 lines · Joel Becker
The specific compile errors I am getting are:
/build/jlbec/linux-2.6/working/fs/ocfs2/ioctl.c: In function ?ocfs2_info_handle?:
/build/jlbec/linux-2.6/working/fs/ocfs2/ioctl.c:414: error: implicit declaration of function ?compat_ptr?
Quoted 7 lines
Quoted 2 lines
and:
Joel, thanks for pointing this out, it's a big defect here, I just tested under ppc/x86_64/i386.
Have not tried on ia64 yet... that's totally my mistake...
You're not required to test ia64 specifically. I got the
compile error on i386, so I wonder how you did not.
Joel
Signature · 8 lines
"Get right to the heart of matters. It's the heart that matters more." Joel Becker Principal Software Developer Oracle E-mail: joel.becker at oracle.com Phone: (650) 506-8127
PATCH 1/1 Ocfs2: Add new OCFS2_IOC_INFO ioctl for ocfs2 v7.
Quoted 12 lines · Joel Becker
Quoted 10 lines · tristan
Quoted 8 lines · Joel Becker
The specific compile errors I am getting are:
/build/jlbec/linux-2.6/working/fs/ocfs2/ioctl.c: In function ?ocfs2_info_handle?:
/build/jlbec/linux-2.6/working/fs/ocfs2/ioctl.c:414: error: implicit declaration of function ?compat_ptr?and:
Quoted 9 lines
Quoted 5 lines
Joel, thanks for pointing this out, it's a big defect here, I just tested under ppc/x86_64/i386.
Have not tried on ia64 yet... that's totally my mistake...
You're not required to test ia64 specifically. I got the
compile error on i386, so I wonder how you did not.
I got error this time as well, I'm afraid I might be testing this before I add ocfs2_info_handle to compat_ioctl...
Quoted 3 lines
Joel