diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2014-05-05 17:46:09 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-05-05 17:46:08 -0700 |
| commit | fb5ed0174278dfb7c9952d3287a72957f2e5b2b8 (patch) | |
| tree | c720b256a1a28c5390b63d1219982f0185b37131 /net/netfilter | |
| parent | bafb9442f8ff923260c010d8e24691f176e6c277 (diff) | |
| parent | 8b4f8900a089383caadfb222e1df55a7e9faba6c (diff) | |
| download | qcom-msm-v3.10-fb5ed0174278dfb7c9952d3287a72957f2e5b2b8.tar.gz | |
Merge "net: netfilter: fix compilation warnings"
Diffstat (limited to 'net/netfilter')
| -rw-r--r-- | net/netfilter/xt_qtaguid.c | 16 | ||||
| -rw-r--r-- | net/netfilter/xt_quota2.c | 8 |
2 files changed, 13 insertions, 11 deletions
diff --git a/net/netfilter/xt_qtaguid.c b/net/netfilter/xt_qtaguid.c index b73e7e34620..dfdacb51a1d 100644 --- a/net/netfilter/xt_qtaguid.c +++ b/net/netfilter/xt_qtaguid.c @@ -594,8 +594,8 @@ static void put_tag_ref_tree(tag_t full_tag, struct uid_tag_data *utd_entry) } } -static int read_proc_u64(struct file *file, char __user *buf, - size_t size, loff_t *ppos) +static ssize_t read_proc_u64(struct file *file, char __user *buf, + size_t size, loff_t *ppos) { uint64_t *valuep = PDE_DATA(file_inode(file)); char tmp[24]; @@ -605,8 +605,8 @@ static int read_proc_u64(struct file *file, char __user *buf, return simple_read_from_buffer(buf, size, ppos, tmp, tmp_size); } -static int read_proc_bool(struct file *file, char __user *buf, - size_t size, loff_t *ppos) +static ssize_t read_proc_bool(struct file *file, char __user *buf, + size_t size, loff_t *ppos) { bool *valuep = PDE_DATA(file_inode(file)); char tmp[24]; @@ -1491,7 +1491,7 @@ static int proc_iface_stat_fmt_open(struct inode *inode, struct file *file) if (!s) return -ENOMEM; - s->fmt = (int)PDE_DATA(inode); + s->fmt = (int)(long)PDE_DATA(inode); return 0; } @@ -2482,8 +2482,10 @@ err: } #define MAX_QTAGUID_CTRL_INPUT_LEN 255 -static int qtaguid_ctrl_proc_write(struct file *file, const char __user *buffer, - size_t count, loff_t *offp) +static ssize_t qtaguid_ctrl_proc_write(struct file *file, + const char __user *buffer, + size_t count, + loff_t *offp) { char input_buf[MAX_QTAGUID_CTRL_INPUT_LEN]; diff --git a/net/netfilter/xt_quota2.c b/net/netfilter/xt_quota2.c index 44ebdcc7596..9f10e1b2423 100644 --- a/net/netfilter/xt_quota2.c +++ b/net/netfilter/xt_quota2.c @@ -122,8 +122,8 @@ static void quota2_log(unsigned int hooknum, } #endif /* if+else CONFIG_NETFILTER_XT_MATCH_QUOTA2_LOG */ -static int quota_proc_read(struct file *file, char __user *buf, - size_t size, loff_t *ppos) +static ssize_t quota_proc_read(struct file *file, char __user *buf, + size_t size, loff_t *ppos) { struct xt_quota_counter *e = PDE_DATA(file_inode(file)); char tmp[24]; @@ -135,8 +135,8 @@ static int quota_proc_read(struct file *file, char __user *buf, return simple_read_from_buffer(buf, size, ppos, tmp, tmp_size); } -static int quota_proc_write(struct file *file, const char __user *input, - size_t size, loff_t *ppos) +static ssize_t quota_proc_write(struct file *file, const char __user *input, + size_t size, loff_t *ppos) { struct xt_quota_counter *e = PDE_DATA(file_inode(file)); char buf[sizeof("18446744073709551616")]; |