All of lore.kernel.org
 help / color / mirror / Atom feed
From: Anand Jain <anand.jain@oracle.com>
To: linux-btrfs@vger.kernel.org
Cc: clm@fb.com, dsterba@suse.cz
Subject: [PATCH 02/23] Btrfs: rename btrfs_sysfs_remove_one to btrfs_sysfs_remove_mounted
Date: Fri, 14 Aug 2015 18:32:47 +0800	[thread overview]
Message-ID: <1439548388-29686-3-git-send-email-anand.jain@oracle.com> (raw)
In-Reply-To: <1439548388-29686-1-git-send-email-anand.jain@oracle.com>

---
 fs/btrfs/ctree.h   | 2 +-
 fs/btrfs/disk-io.c | 4 ++--
 fs/btrfs/sysfs.c   | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index afce306..4484063 100644
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -4005,7 +4005,7 @@ int btrfs_defrag_leaves(struct btrfs_trans_handle *trans,
 int btrfs_init_sysfs(void);
 void btrfs_exit_sysfs(void);
 int btrfs_sysfs_add_mounted(struct btrfs_fs_info *fs_info);
-void btrfs_sysfs_remove_one(struct btrfs_fs_info *fs_info);
+void btrfs_sysfs_remove_mounted(struct btrfs_fs_info *fs_info);
 
 /* xattr.c */
 ssize_t btrfs_listxattr(struct dentry *dentry, char *buffer, size_t size);
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 376a6ef..8571025 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -3108,7 +3108,7 @@ fail_cleaner:
 	filemap_write_and_wait(fs_info->btree_inode->i_mapping);
 
 fail_sysfs:
-	btrfs_sysfs_remove_one(fs_info);
+	btrfs_sysfs_remove_mounted(fs_info);
 
 fail_fsdev_sysfs:
 	btrfs_sysfs_remove_fsid(fs_info->fs_devices);
@@ -3791,7 +3791,7 @@ void close_ctree(struct btrfs_root *root)
 		       percpu_counter_sum(&fs_info->delalloc_bytes));
 	}
 
-	btrfs_sysfs_remove_one(fs_info);
+	btrfs_sysfs_remove_mounted(fs_info);
 	btrfs_sysfs_remove_fsid(fs_info->fs_devices);
 
 	btrfs_free_fs_roots(fs_info);
diff --git a/fs/btrfs/sysfs.c b/fs/btrfs/sysfs.c
index cabf840..095a302 100644
--- a/fs/btrfs/sysfs.c
+++ b/fs/btrfs/sysfs.c
@@ -545,7 +545,7 @@ void btrfs_sysfs_remove_fsid(struct btrfs_fs_devices *fs_devs)
 	}
 }
 
-void btrfs_sysfs_remove_one(struct btrfs_fs_info *fs_info)
+void btrfs_sysfs_remove_mounted(struct btrfs_fs_info *fs_info)
 {
 	btrfs_reset_fs_info_ptr(fs_info);
 
@@ -776,7 +776,7 @@ int btrfs_sysfs_add_mounted(struct btrfs_fs_info *fs_info)
 
 	return 0;
 failure:
-	btrfs_sysfs_remove_one(fs_info);
+	btrfs_sysfs_remove_mounted(fs_info);
 	return error;
 }
 
-- 
2.4.1


  parent reply	other threads:[~2015-08-14 10:33 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-08-14 10:32 [PATCH 00/23] btrfs device related patch set Anand Jain
2015-08-14 10:32 ` [PATCH 01/23] Btrfs: rename btrfs_sysfs_add_one to btrfs_sysfs_add_mounted Anand Jain
2015-08-14 10:32 ` Anand Jain [this message]
2015-08-14 10:32 ` [PATCH 03/23] Btrfs: rename btrfs_kobj_add_device to btrfs_sysfs_add_device_link Anand Jain
2015-08-14 10:32 ` [PATCH 04/23] Btrfs: rename btrfs_kobj_rm_device to btrfs_sysfs_rm_device_link Anand Jain
2015-08-14 10:32 ` [PATCH 05/23] Btrfs: rename super_kobj to fsid_kobj Anand Jain
2015-08-14 10:32 ` [PATCH 06/23] Btrfs: SB read failure should return EIO for __bread failure Anand Jain
2015-08-14 10:32 ` [PATCH 07/23] Btrfs: __btrfs_std_error() logic should be consistent w/out CONFIG_PRINTK defined Anand Jain
2015-08-14 10:32 ` [PATCH 08/23] Btrfs: device delete by devid Anand Jain
2015-10-06  9:38   ` [PATCH V4 08/23] Btrfs: Introduce " Anand Jain
2015-08-14 10:32 ` [PATCH 09/23] Btrfs: move check for min number of devices to a function Anand Jain
2015-08-14 10:32 ` [PATCH 10/23] Btrfs: rename btrfs_dev_replace_find_srcdev() Anand Jain
2015-08-14 10:32 ` [PATCH 11/23] Btrfs: use BTRFS_ERROR_DEV_MISSING_NOT_FOUND when missing device is not found Anand Jain
2015-08-14 10:32 ` [PATCH 12/23] Btrfs: use btrfs_find_device_by_user_input() Anand Jain
2015-08-14 10:32 ` [PATCH 13/23] Btrfs: add btrfs_read_dev_one_super() to read one specific SB Anand Jain
2015-08-14 10:32 ` [PATCH 14/23] Btrfs: fix btrfs_scratch_superblock() with fixes from device delete Anand Jain
2015-08-14 10:33 ` [PATCH 15/23] Btrfs: use btrfs_scratch_superblock() in btrfs_rm_device() Anand Jain
2015-08-14 10:33 ` [PATCH 16/23] Btrfs: device path change must be logged Anand Jain
2015-10-01 13:40   ` David Sterba
2015-10-01 13:47     ` Anand Jain
2015-10-05  8:50       ` Anand Jain
2015-08-14 10:33 ` [PATCH 17/23] Btrfs: kernel operation should come after user input has been verified Anand Jain
2015-08-14 10:33 ` [PATCH 18/23] Btrfs: check device_path in btrfs_find_device_by_user_input() Anand Jain
2015-08-14 10:33 ` [PATCH 19/23] Btrfs: avoid user cli usage error logging into the sys log Anand Jain
2015-08-14 10:33 ` [PATCH 20/23] Btrfs: move device close to btrfs_close_one_device Anand Jain
2015-08-14 10:33 ` [PATCH 21/23] Btrfs: fix fs logging for multi device Anand Jain
2015-10-01 13:45   ` David Sterba
2015-10-01 13:48     ` Anand Jain
2015-08-14 10:33 ` [PATCH 22/23] Btrfs: move kobj stuff out of dev_replace lock range Anand Jain
2015-08-14 10:33 ` [PATCH 23/23] Btrfs: allow -o rw,degraded for single group profile Anand Jain
2015-09-29 14:34 ` [PATCH 00/23] btrfs device related patch set David Sterba
2015-09-29 22:10   ` Anand Jain
2015-09-30 15:05     ` David Sterba
2015-10-01 14:42       ` David Sterba
2015-10-01 15:00         ` Anand Jain
2015-10-01 16:17           ` David Sterba
2015-10-02  8:07             ` Anand Jain

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1439548388-29686-3-git-send-email-anand.jain@oracle.com \
    --to=anand.jain@oracle.com \
    --cc=clm@fb.com \
    --cc=dsterba@suse.cz \
    --cc=linux-btrfs@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.