aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Hambleton <mahamble@broadcom.com>2013-11-29 13:44:53 +0000
committerMark Brown <broonie@linaro.org>2013-12-13 18:48:02 +0000
commit7138440c585bba445e0dc60dc202f6894f110135 (patch)
tree32c478b619d54a7dc9e862efb3583723c98bab6f
parenteed4bafd63b5584adb832a582a931ecba41dec55 (diff)
downloadlinaro-lsk-v3.10/topic/aosp-warnings.tar.gz
netfilter: fix function return types for 64bitv3.10/topic/aosp-warnings
Fix functions to return ssize_t instead of int to match prototypes. Signed-off-by: Mark Hambleton <mahamble@broadcom.com> Reviewed-by: Edwin Chan <echan@broadcom.com> Reviewed-by: James King <jamesk@broadcom.com> Reviewed-by: John Garry <jgarry@broadcom.com> Reviewed-by: Mark Hambleton <mark.hambleton@broadcom.com> Reviewed-by: Joyjit Nath <joyjit@broadcom.com> Signed-off-by: Mark Brown <broonie@linaro.org>
-rw-r--r--net/netfilter/xt_qtaguid.c10
-rw-r--r--net/netfilter/xt_quota2.c4
2 files changed, 7 insertions, 7 deletions
diff --git a/net/netfilter/xt_qtaguid.c b/net/netfilter/xt_qtaguid.c
index 4a16829969a..7346522cf3a 100644
--- a/net/netfilter/xt_qtaguid.c
+++ b/net/netfilter/xt_qtaguid.c
@@ -594,7 +594,7 @@ 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,
+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));
@@ -605,7 +605,7 @@ 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,
+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));
@@ -702,7 +702,7 @@ static void pp_iface_stat_line(struct seq_file *m,
}
struct proc_iface_stat_fmt_info {
- int fmt;
+ long fmt;
};
static void *iface_stat_fmt_proc_start(struct seq_file *m, loff_t *pos)
@@ -1488,7 +1488,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 = (long)PDE_DATA(inode);
return 0;
}
@@ -2479,7 +2479,7 @@ err:
}
#define MAX_QTAGUID_CTRL_INPUT_LEN 255
-static int qtaguid_ctrl_proc_write(struct file *file, const char __user *buffer,
+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..4328562572f 100644
--- a/net/netfilter/xt_quota2.c
+++ b/net/netfilter/xt_quota2.c
@@ -122,7 +122,7 @@ 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,
+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));
@@ -135,7 +135,7 @@ 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,
+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));