leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ocfs2: Using inline funcs to set/clear *FILLED* flags in info handler.

Browse Source 
It just removes some macros for the sake of typechecking gains.

Signed-off-by: Tristan Ye <tristan.ye@oracle.com>
This commit is contained in:
Tristan Ye 2011-05-24 15:22:59 +08:00
parent 4a7df24ddc
commit 8aa1fa360d
1 changed files with 19 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
fs/ocfs2/ioctl.c
View File

@ -35,32 +35,23 @@
* be -EFAULT. The error will be returned from the ioctl(2) call. It's * 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. * 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, static inline void o2info_set_request_error(struct ocfs2_info_request *kreq,
struct ocfs2_info_request __user *req) struct ocfs2_info_request __user *req)
{ {
kreq->ir_flags |= OCFS2_INFO_FL_ERROR; kreq->ir_flags |= OCFS2_INFO_FL_ERROR;
(void)put_user(kreq->ir_flags, (__u32 __user *)&(req->ir_flags)); (void)put_user(kreq->ir_flags, (__u32 __user *)&(req->ir_flags));
} }
#define o2info_set_request_error(a, b) \ static inline void o2info_set_request_filled(struct ocfs2_info_request *req)
__o2info_set_request_error((struct ocfs2_info_request *)&(a), b)
static inline void __o2info_set_request_filled(struct ocfs2_info_request *req)
{ {
req->ir_flags |= OCFS2_INFO_FL_FILLED; req->ir_flags |= OCFS2_INFO_FL_FILLED;
} }
#define o2info_set_request_filled(a) \ static inline void o2info_clear_request_filled(struct ocfs2_info_request *req)
__o2info_set_request_filled((struct ocfs2_info_request *)&(a))
static inline void __o2info_clear_request_filled(struct ocfs2_info_request *req)
{ {
req->ir_flags &= ~OCFS2_INFO_FL_FILLED; req->ir_flags &= ~OCFS2_INFO_FL_FILLED;
} }
#define o2info_clear_request_filled(a) \
__o2info_clear_request_filled((struct ocfs2_info_request *)&(a))
static int ocfs2_get_inode_attr(struct inode *inode, unsigned *flags) static int ocfs2_get_inode_attr(struct inode *inode, unsigned *flags)
{ {
int status; int status;
@ -153,7 +144,7 @@ int ocfs2_info_handle_blocksize(struct inode *inode,
oib.ib_blocksize = inode->i_sb->s_blocksize; oib.ib_blocksize = inode->i_sb->s_blocksize;
o2info_set_request_filled(oib); o2info_set_request_filled(&oib.ib_req);
if (o2info_to_user(oib, req)) if (o2info_to_user(oib, req))
goto bail; goto bail;
@ -161,7 +152,7 @@ int ocfs2_info_handle_blocksize(struct inode *inode,
status = 0; status = 0;
bail: bail:
if (status) if (status)
o2info_set_request_error(oib, req); o2info_set_request_error(&oib.ib_req, req);
return status; return status;
} }
@ -178,7 +169,7 @@ int ocfs2_info_handle_clustersize(struct inode *inode,
oic.ic_clustersize = osb->s_clustersize; oic.ic_clustersize = osb->s_clustersize;
o2info_set_request_filled(oic); o2info_set_request_filled(&oic.ic_req);
if (o2info_to_user(oic, req)) if (o2info_to_user(oic, req))
goto bail; goto bail;
@ -186,7 +177,7 @@ int ocfs2_info_handle_clustersize(struct inode *inode,
status = 0; status = 0;
bail: bail:
if (status) if (status)
o2info_set_request_error(oic, req); o2info_set_request_error(&oic.ic_req, req);
return status; return status;
} }
@ -203,7 +194,7 @@ int ocfs2_info_handle_maxslots(struct inode *inode,
oim.im_max_slots = osb->max_slots; oim.im_max_slots = osb->max_slots;
o2info_set_request_filled(oim); o2info_set_request_filled(&oim.im_req);
if (o2info_to_user(oim, req)) if (o2info_to_user(oim, req))
goto bail; goto bail;
@ -211,7 +202,7 @@ int ocfs2_info_handle_maxslots(struct inode *inode,
status = 0; status = 0;
bail: bail:
if (status) if (status)
o2info_set_request_error(oim, req); o2info_set_request_error(&oim.im_req, req);
return status; return status;
} }
@ -228,7 +219,7 @@ int ocfs2_info_handle_label(struct inode *inode,
memcpy(oil.il_label, osb->vol_label, OCFS2_MAX_VOL_LABEL_LEN); memcpy(oil.il_label, osb->vol_label, OCFS2_MAX_VOL_LABEL_LEN);
o2info_set_request_filled(oil); o2info_set_request_filled(&oil.il_req);
if (o2info_to_user(oil, req)) if (o2info_to_user(oil, req))
goto bail; goto bail;
@ -236,7 +227,7 @@ int ocfs2_info_handle_label(struct inode *inode,
status = 0; status = 0;
bail: bail:
if (status) if (status)
o2info_set_request_error(oil, req); o2info_set_request_error(&oil.il_req, req);
return status; return status;
} }
@ -253,7 +244,7 @@ int ocfs2_info_handle_uuid(struct inode *inode,
memcpy(oiu.iu_uuid_str, osb->uuid_str, OCFS2_TEXT_UUID_LEN + 1); memcpy(oiu.iu_uuid_str, osb->uuid_str, OCFS2_TEXT_UUID_LEN + 1);
o2info_set_request_filled(oiu); o2info_set_request_filled(&oiu.iu_req);
if (o2info_to_user(oiu, req)) if (o2info_to_user(oiu, req))
goto bail; goto bail;
@ -261,7 +252,7 @@ int ocfs2_info_handle_uuid(struct inode *inode,
status = 0; status = 0;
bail: bail:
if (status) if (status)
o2info_set_request_error(oiu, req); o2info_set_request_error(&oiu.iu_req, req);
return status; return status;
} }
@ -280,7 +271,7 @@ int ocfs2_info_handle_fs_features(struct inode *inode,
oif.if_incompat_features = osb->s_feature_incompat; oif.if_incompat_features = osb->s_feature_incompat;
oif.if_ro_compat_features = osb->s_feature_ro_compat; oif.if_ro_compat_features = osb->s_feature_ro_compat;
o2info_set_request_filled(oif); o2info_set_request_filled(&oif.if_req);
if (o2info_to_user(oif, req)) if (o2info_to_user(oif, req))
goto bail; goto bail;
@ -288,7 +279,7 @@ int ocfs2_info_handle_fs_features(struct inode *inode,
status = 0; status = 0;
bail: bail:
if (status) if (status)
o2info_set_request_error(oif, req); o2info_set_request_error(&oif.if_req, req);
return status; return status;
} }
@ -305,7 +296,7 @@ int ocfs2_info_handle_journal_size(struct inode *inode,
oij.ij_journal_size = osb->journal->j_inode->i_size; oij.ij_journal_size = osb->journal->j_inode->i_size;
o2info_set_request_filled(oij); o2info_set_request_filled(&oij.ij_req);
if (o2info_to_user(oij, req)) if (o2info_to_user(oij, req))
goto bail; goto bail;
@ -313,7 +304,7 @@ int ocfs2_info_handle_journal_size(struct inode *inode,
status = 0; status = 0;
bail: bail:
if (status) if (status)
o2info_set_request_error(oij, req); o2info_set_request_error(&oij.ij_req, req);
return status; return status;
} }
@ -327,7 +318,7 @@ int ocfs2_info_handle_unknown(struct inode *inode,
if (o2info_from_user(oir, req)) if (o2info_from_user(oir, req))
goto bail; goto bail;
o2info_clear_request_filled(oir); o2info_clear_request_filled(&oir);
if (o2info_to_user(oir, req)) if (o2info_to_user(oir, req))
goto bail; goto bail;
@ -335,7 +326,7 @@ int ocfs2_info_handle_unknown(struct inode *inode,
status = 0; status = 0;
bail: bail:
if (status) if (status)
o2info_set_request_error(oir, req); o2info_set_request_error(&oir, req);
return status; return status;
} }