X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=fs%2Fgfs2%2Fsys.c;h=983eaf1e06becb3e0c6516bb04ffa397bc121ab9;hb=2b2842146cb4105877c2be51d3857ec61ebd4ff9;hp=f05ba8f69132850a3d20ea9c59afb9290d7a14a1;hpb=7d63b54a65ce902f9aaa8efe8192aa3b983264d4;p=linux-2.6

diff --git a/fs/gfs2/sys.c b/fs/gfs2/sys.c
index f05ba8f691..983eaf1e06 100644
--- a/fs/gfs2/sys.c
+++ b/fs/gfs2/sys.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) Sistina Software, Inc.  1997-2003 All rights reserved.
- * Copyright (C) 2004-2005 Red Hat, Inc.  All rights reserved.
+ * Copyright (C) 2004-2006 Red Hat, Inc.  All rights reserved.
  *
  * This copyrighted material is made available to anyone wishing to use,
  * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU General Public License v.2.
+ * of the GNU General Public License version 2.
  */
 
 #include <linux/sched.h>
@@ -15,11 +15,10 @@
 #include <linux/module.h>
 #include <linux/kobject.h>
 #include <linux/gfs2_ondisk.h>
-#include <asm/semaphore.h>
+#include <linux/lm_interface.h>
 #include <asm/uaccess.h>
 
 #include "gfs2.h"
-#include "lm_interface.h"
 #include "incore.h"
 #include "lm.h"
 #include "sys.h"
@@ -33,12 +32,12 @@ spinlock_t gfs2_sys_margs_lock;
 
 static ssize_t id_show(struct gfs2_sbd *sdp, char *buf)
 {
-	return sprintf(buf, "%s\n", sdp->sd_vfs->s_id);
+	return snprintf(buf, PAGE_SIZE, "%s\n", sdp->sd_vfs->s_id);
 }
 
 static ssize_t fsname_show(struct gfs2_sbd *sdp, char *buf)
 {
-	return sprintf(buf, "%s\n", sdp->sd_fsname);
+	return snprintf(buf, PAGE_SIZE, "%s\n", sdp->sd_fsname);
 }
 
 static ssize_t freeze_show(struct gfs2_sbd *sdp, char *buf)
@@ -49,7 +48,7 @@ static ssize_t freeze_show(struct gfs2_sbd *sdp, char *buf)
 	count = sdp->sd_freeze_count;
 	mutex_unlock(&sdp->sd_freeze_lock);
 
-	return sprintf(buf, "%u\n", count);
+	return snprintf(buf, PAGE_SIZE, "%u\n", count);
 }
 
 static ssize_t freeze_store(struct gfs2_sbd *sdp, const char *buf, size_t len)
@@ -81,7 +80,7 @@ static ssize_t freeze_store(struct gfs2_sbd *sdp, const char *buf, size_t len)
 static ssize_t withdraw_show(struct gfs2_sbd *sdp, char *buf)
 {
 	unsigned int b = test_bit(SDF_SHUTDOWN, &sdp->sd_flags);
-	return sprintf(buf, "%u\n", b);
+	return snprintf(buf, PAGE_SIZE, "%u\n", b);
 }
 
 static ssize_t withdraw_store(struct gfs2_sbd *sdp, const char *buf, size_t len)
@@ -139,7 +138,7 @@ static ssize_t quota_sync_store(struct gfs2_sbd *sdp, const char *buf,
 static ssize_t quota_refresh_user_store(struct gfs2_sbd *sdp, const char *buf,
 					size_t len)
 {
-	uint32_t id;
+	u32 id;
 
 	if (!capable(CAP_SYS_ADMIN))
 		return -EACCES;
@@ -153,7 +152,7 @@ static ssize_t quota_refresh_user_store(struct gfs2_sbd *sdp, const char *buf,
 static ssize_t quota_refresh_group_store(struct gfs2_sbd *sdp, const char *buf,
 					 size_t len)
 {
-	uint32_t id;
+	u32 id;
 
 	if (!capable(CAP_SYS_ADMIN))
 		return -EACCES;
@@ -224,7 +223,7 @@ static struct kobj_type gfs2_ktype = {
 
 static struct kset gfs2_kset = {
 	.subsys = &fs_subsys,
-	.kobj   = {.name = "gfs2",},
+	.kobj   = {.name = "gfs2"},
 	.ktype  = &gfs2_ktype,
 };
 
@@ -240,7 +239,7 @@ struct lockstruct_attr {
 #define LOCKSTRUCT_ATTR(name, fmt)                                          \
 static ssize_t name##_show(struct gfs2_sbd *sdp, char *buf)                 \
 {                                                                           \
-	return sprintf(buf, fmt, sdp->sd_lockstruct.ls_##name);             \
+	return snprintf(buf, PAGE_SIZE, fmt, sdp->sd_lockstruct.ls_##name); \
 }                                                                           \
 static struct lockstruct_attr lockstruct_attr_##name = __ATTR_RO(name)
 
@@ -254,7 +253,7 @@ static struct attribute *lockstruct_attrs[] = {
 	&lockstruct_attr_first.attr,
 	&lockstruct_attr_lvb_size.attr,
 	&lockstruct_attr_flags.attr,
-	NULL
+	NULL,
 };
 
 /*
@@ -269,7 +268,7 @@ struct args_attr {
 #define ARGS_ATTR(name, fmt)                                                \
 static ssize_t name##_show(struct gfs2_sbd *sdp, char *buf)                 \
 {                                                                           \
-	return sprintf(buf, fmt, sdp->sd_args.ar_##name);                   \
+	return snprintf(buf, PAGE_SIZE, fmt, sdp->sd_args.ar_##name);       \
 }                                                                           \
 static struct args_attr args_attr_##name = __ATTR_RO(name)
 
@@ -291,7 +290,8 @@ ARGS_ATTR(data,            "%d\n");
 /* one oddball doesn't fit the macro mold */
 static ssize_t noatime_show(struct gfs2_sbd *sdp, char *buf)
 {
-	return sprintf(buf, "%d\n", !!test_bit(SDF_NOATIME, &sdp->sd_flags));
+	return snprintf(buf, PAGE_SIZE, "%d\n",
+			!!test_bit(SDF_NOATIME, &sdp->sd_flags));
 }
 static struct args_attr args_attr_noatime = __ATTR_RO(noatime);
 
@@ -311,7 +311,7 @@ static struct attribute *args_attrs[] = {
 	&args_attr_suiddir.attr,
 	&args_attr_data.attr,
 	&args_attr_noatime.attr,
-	NULL
+	NULL,
 };
 
 /*
@@ -326,7 +326,8 @@ struct counters_attr {
 #define COUNTERS_ATTR(name, fmt)                                            \
 static ssize_t name##_show(struct gfs2_sbd *sdp, char *buf)                 \
 {                                                                           \
-	return sprintf(buf, fmt, (unsigned int)atomic_read(&sdp->sd_##name)); \
+	return snprintf(buf, PAGE_SIZE, fmt,                                \
+			(unsigned int)atomic_read(&sdp->sd_##name));        \
 }                                                                           \
 static struct counters_attr counters_attr_##name = __ATTR_RO(name)
 
@@ -340,7 +341,7 @@ static struct attribute *counters_attrs[] = {
 	&counters_attr_glock_held_count.attr,
 	&counters_attr_inode_count.attr,
 	&counters_attr_reclaimed.attr,
-	NULL
+	NULL,
 };
 
 /*
@@ -349,8 +350,9 @@ static struct attribute *counters_attrs[] = {
 
 static ssize_t quota_scale_show(struct gfs2_sbd *sdp, char *buf)
 {
-	return sprintf(buf, "%u %u\n", sdp->sd_tune.gt_quota_scale_num,
-				       sdp->sd_tune.gt_quota_scale_den);
+	return snprintf(buf, PAGE_SIZE, "%u %u\n",
+			sdp->sd_tune.gt_quota_scale_num,
+			sdp->sd_tune.gt_quota_scale_den);
 }
 
 static ssize_t quota_scale_store(struct gfs2_sbd *sdp, const char *buf,
@@ -404,7 +406,7 @@ static struct tune_attr tune_attr_##name = __ATTR(name, 0644, show, store)
 #define TUNE_ATTR_2(name, store)                                              \
 static ssize_t name##_show(struct gfs2_sbd *sdp, char *buf)                   \
 {                                                                             \
-	return sprintf(buf, "%u\n", sdp->sd_tune.gt_##name);                  \
+	return snprintf(buf, PAGE_SIZE, "%u\n", sdp->sd_tune.gt_##name);      \
 }                                                                             \
 TUNE_ATTR_3(name, name##_show, store)
 
@@ -424,9 +426,6 @@ static ssize_t name##_store(struct gfs2_sbd *sdp, const char *buf, size_t len)\
 }                                                                             \
 TUNE_ATTR_2(name, name##_store)
 
-TUNE_ATTR(ilimit, 0);
-TUNE_ATTR(ilimit_tries, 0);
-TUNE_ATTR(ilimit_min, 0);
 TUNE_ATTR(demote_secs, 0);
 TUNE_ATTR(incore_log_blocks, 0);
 TUNE_ATTR(log_flush_secs, 0);
@@ -445,7 +444,6 @@ TUNE_ATTR(quota_simul_sync, 1);
 TUNE_ATTR(quota_cache_secs, 1);
 TUNE_ATTR(max_atomic_write, 1);
 TUNE_ATTR(stall_secs, 1);
-TUNE_ATTR(entries_per_readdir, 1);
 TUNE_ATTR(greedy_default, 1);
 TUNE_ATTR(greedy_quantum, 1);
 TUNE_ATTR(greedy_max, 1);
@@ -454,13 +452,9 @@ TUNE_ATTR_DAEMON(scand_secs, scand_process);
 TUNE_ATTR_DAEMON(recoverd_secs, recoverd_process);
 TUNE_ATTR_DAEMON(logd_secs, logd_process);
 TUNE_ATTR_DAEMON(quotad_secs, quotad_process);
-TUNE_ATTR_DAEMON(inoded_secs, inoded_process);
 TUNE_ATTR_3(quota_scale, quota_scale_show, quota_scale_store);
 
 static struct attribute *tune_attrs[] = {
-	&tune_attr_ilimit.attr,
-	&tune_attr_ilimit_tries.attr,
-	&tune_attr_ilimit_min.attr,
 	&tune_attr_demote_secs.attr,
 	&tune_attr_incore_log_blocks.attr,
 	&tune_attr_log_flush_secs.attr,
@@ -477,7 +471,6 @@ static struct attribute *tune_attrs[] = {
 	&tune_attr_quota_cache_secs.attr,
 	&tune_attr_max_atomic_write.attr,
 	&tune_attr_stall_secs.attr,
-	&tune_attr_entries_per_readdir.attr,
 	&tune_attr_greedy_default.attr,
 	&tune_attr_greedy_quantum.attr,
 	&tune_attr_greedy_max.attr,
@@ -486,31 +479,30 @@ static struct attribute *tune_attrs[] = {
 	&tune_attr_recoverd_secs.attr,
 	&tune_attr_logd_secs.attr,
 	&tune_attr_quotad_secs.attr,
-	&tune_attr_inoded_secs.attr,
 	&tune_attr_quota_scale.attr,
 	&tune_attr_new_files_jdata.attr,
 	&tune_attr_new_files_directio.attr,
-	NULL
+	NULL,
 };
 
 static struct attribute_group lockstruct_group = {
 	.name = "lockstruct",
-	.attrs = lockstruct_attrs
+	.attrs = lockstruct_attrs,
 };
 
 static struct attribute_group counters_group = {
 	.name = "counters",
-	.attrs = counters_attrs
+	.attrs = counters_attrs,
 };
 
 static struct attribute_group args_group = {
 	.name = "args",
-	.attrs = args_attrs
+	.attrs = args_attrs,
 };
 
 static struct attribute_group tune_group = {
 	.name = "tune",
-	.attrs = tune_attrs
+	.attrs = tune_attrs,
 };
 
 int gfs2_sys_fs_add(struct gfs2_sbd *sdp)
@@ -546,15 +538,16 @@ int gfs2_sys_fs_add(struct gfs2_sbd *sdp)
 
 	return 0;
 
- fail_args:
+fail_args:
 	sysfs_remove_group(&sdp->sd_kobj, &args_group);
- fail_counters:
+fail_counters:
 	sysfs_remove_group(&sdp->sd_kobj, &counters_group);
- fail_lockstruct:
+fail_lockstruct:
 	sysfs_remove_group(&sdp->sd_kobj, &lockstruct_group);
- fail_reg:
+fail_reg:
 	kobject_unregister(&sdp->sd_kobj);
- fail:
+fail:
+	fs_err(sdp, "error %d adding sysfs files", error);
 	return error;
 }