Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6 (de80af4c) · Commits · 戴 / test

Documentation/HOWTO

+2 −2

Original line number	Diff line number	Diff line
		@@ -208,7 +208,7 @@ tools. One such tool that is particularly recommended is the Linux
		Cross-Reference project, which is able to present source code in a
		self-referential, indexed webpage format. An excellent up-to-date
		repository of the kernel code may be found at:
		http://sosdg.org/~coywolf/lxr/
		http://users.sosdg.org/~qiyong/lxr/


		The development process
		@@ -384,7 +384,7 @@ One of the best ways to put into practice your hacking skills is by fixing
		bugs reported by other people. Not only you will help to make the kernel
		more stable, you'll learn to fix real world problems and you will improve
		your skills, and other developers will be aware of your presence. Fixing
		bugs is one of the best ways to earn merit amongst the developers, because
		bugs is one of the best ways to get merits among other developers, because
		not many people like wasting time fixing other people's bugs.

		To work in the already reported bug reports, go to http://bugzilla.kernel.org.

Documentation/SubmittingPatches

+1 −1

Original line number	Diff line number	Diff line
		@@ -560,7 +560,7 @@ NO!!!! No more huge patch bombs to linux-kernel@vger.kernel.org people!
		<http://marc.theaimsgroup.com/?l=linux-kernel&m=112112749912944&w=2>

		Kernel Documentation/CodingStyle:
		<http://sosdg.org/~coywolf/lxr/source/Documentation/CodingStyle>
		<http://users.sosdg.org/~qiyong/lxr/source/Documentation/CodingStyle>

		Linus Torvalds's mail on the canonical patch format:
		<http://lkml.org/lkml/2005/4/7/183>

Documentation/ko_KR/HOWTO

0 → 100644

+623 −0

File added.

Preview size limit exceeded, changes collapsed.

fs/sysfs/bin.c

+1 −6

Original line number	Diff line number	Diff line
		@@ -248,12 +248,7 @@ int sysfs_create_bin_file(struct kobject * kobj, struct bin_attribute * attr)

		void sysfs_remove_bin_file(struct kobject * kobj, struct bin_attribute * attr)
		{
		if (sysfs_hash_and_remove(kobj->sd, attr->attr.name) < 0) {
		printk(KERN_ERR "%s: "
		"bad dentry or inode or no such file: \"%s\"\n",
		__FUNCTION__, attr->attr.name);
		dump_stack();
		}
		sysfs_hash_and_remove(kobj->sd, attr->attr.name);
		}

		EXPORT_SYMBOL_GPL(sysfs_create_bin_file);

fs/sysfs/dir.c

+12 −9

Original line number	Diff line number	Diff line
		@@ -762,12 +762,15 @@ static int sysfs_count_nlink(struct sysfs_dirent *sd)
		static struct dentry * sysfs_lookup(struct inode dir, struct dentry dentry,
		struct nameidata *nd)
		{
		struct dentry *ret = NULL;
		struct sysfs_dirent * parent_sd = dentry->d_parent->d_fsdata;
		struct sysfs_dirent * sd;
		struct bin_attribute *bin_attr;
		struct inode *inode;
		int found = 0;

		mutex_lock(&sysfs_mutex);

		for (sd = parent_sd->s_children; sd; sd = sd->s_sibling) {
		if (sysfs_type(sd) &&
		!strcmp(sd->s_name, dentry->d_name.name)) {
		@@ -778,14 +781,14 @@ static struct dentry * sysfs_lookup(struct inode dir, struct dentry dentry,

		/* no such entry */
		if (!found)
		return NULL;
		goto out_unlock;

		/* attach dentry and inode */
		inode = sysfs_get_inode(sd);
		if (!inode)
		return ERR_PTR(-ENOMEM);

		mutex_lock(&sysfs_mutex);
		if (!inode) {
		ret = ERR_PTR(-ENOMEM);
		goto out_unlock;
		}

		if (inode->i_state & I_NEW) {
		/* initialize inode according to type */
		@@ -815,9 +818,9 @@ static struct dentry * sysfs_lookup(struct inode dir, struct dentry dentry,
		sysfs_instantiate(dentry, inode);
		sysfs_attach_dentry(sd, dentry);

		out_unlock:
		mutex_unlock(&sysfs_mutex);

		return NULL;
		return ret;
		}

		const struct inode_operations sysfs_dir_inode_operations = {
		@@ -942,6 +945,8 @@ int sysfs_rename_dir(struct kobject kobj, struct sysfs_dirent new_parent_sd,
		if (error)
		goto out_drop;

		mutex_lock(&sysfs_mutex);

		dup_name = sd->s_name;
		sd->s_name = new_name;

		@@ -949,8 +954,6 @@ int sysfs_rename_dir(struct kobject kobj, struct sysfs_dirent new_parent_sd,
		d_add(new_dentry, NULL);
		d_move(sd->s_dentry, new_dentry);

		mutex_lock(&sysfs_mutex);

		sysfs_unlink_sibling(sd);
		sysfs_get(new_parent_sd);
		sysfs_put(sd->s_parent);

Admin message