lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Message-Id: <1360727182-21881-1-git-send-email-tytso@mit.edu> Date: Tue, 12 Feb 2013 22:46:21 -0500 From: Theodore Ts'o <tytso@....edu> To: Ext4 Developers List <linux-ext4@...r.kernel.org> Cc: Zheng Liu <wenqing.lz@...bao.com>, "Theodore Ts'o" <tytso@....edu> Subject: [PATCH 1/2] ext4: rename ext4_es_find_extent() to ext4_es_find_delayed_extent() From: Zheng Liu <wenqing.lz@...bao.com> Rename ext4_es_find_extent() to ext4_es_find_delayed_extent() to make the purpose of this function clearer. [ This was originally part of the next commit, but I separated this out to make it easier to review and debug the next commit. -- Ted ] Signed-off-by: Zheng Liu <wenqing.lz@...bao.com> Signed-off-by: "Theodore Ts'o" <tytso@....edu> --- fs/ext4/extents.c | 4 ++-- fs/ext4/extents_status.c | 9 +++++---- fs/ext4/extents_status.h | 4 ++-- fs/ext4/file.c | 4 ++-- include/trace/events/ext4.h | 4 ++-- 5 files changed, 13 insertions(+), 12 deletions(-) diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c index 06caa54..9802d64 100644 --- a/fs/ext4/extents.c +++ b/fs/ext4/extents.c @@ -3529,7 +3529,7 @@ static int ext4_find_delalloc_range(struct inode *inode, struct extent_status es; es.es_lblk = lblk_start; - (void)ext4_es_find_extent(inode, &es); + (void)ext4_es_find_delayed_extent(inode, &es); if (es.es_len == 0) return 0; /* there is no delay extent in this tree */ else if (es.es_lblk <= lblk_start && @@ -4575,7 +4575,7 @@ static int ext4_find_delayed_extent(struct inode *inode, ext4_lblk_t next_del; es.es_lblk = newex->ec_block; - next_del = ext4_es_find_extent(inode, &es); + next_del = ext4_es_find_delayed_extent(inode, &es); if (newex->ec_start == 0) { /* diff --git a/fs/ext4/extents_status.c b/fs/ext4/extents_status.c index e7e1622..df72e95 100644 --- a/fs/ext4/extents_status.c +++ b/fs/ext4/extents_status.c @@ -229,7 +229,7 @@ static struct extent_status *__es_tree_search(struct rb_root *root, } /* - * ext4_es_find_extent: find the 1st delayed extent covering @es->lblk + * ext4_es_find_delayed_extent: find the 1st delayed extent covering @es->lblk * if it exists, otherwise, the next extent after @es->lblk. * * @inode: the inode which owns delayed extents @@ -239,14 +239,15 @@ static struct extent_status *__es_tree_search(struct rb_root *root, * EXT_MAX_BLOCKS if no extent is found. * Delayed extent is returned via @es. */ -ext4_lblk_t ext4_es_find_extent(struct inode *inode, struct extent_status *es) +ext4_lblk_t ext4_es_find_delayed_extent(struct inode *inode, + struct extent_status *es) { struct ext4_es_tree *tree = NULL; struct extent_status *es1 = NULL; struct rb_node *node; ext4_lblk_t ret = EXT_MAX_BLOCKS; - trace_ext4_es_find_extent_enter(inode, es->es_lblk); + trace_ext4_es_find_delayed_extent_enter(inode, es->es_lblk); read_lock(&EXT4_I(inode)->i_es_lock); tree = &EXT4_I(inode)->i_es_tree; @@ -280,7 +281,7 @@ out: read_unlock(&EXT4_I(inode)->i_es_lock); - trace_ext4_es_find_extent_exit(inode, es, ret); + trace_ext4_es_find_delayed_extent_exit(inode, es, ret); return ret; } diff --git a/fs/ext4/extents_status.h b/fs/ext4/extents_status.h index 2a5d69e..b5788eb 100644 --- a/fs/ext4/extents_status.h +++ b/fs/ext4/extents_status.h @@ -51,8 +51,8 @@ extern int ext4_es_insert_extent(struct inode *inode, ext4_lblk_t lblk, unsigned long long status); extern int ext4_es_remove_extent(struct inode *inode, ext4_lblk_t lblk, ext4_lblk_t len); -extern ext4_lblk_t ext4_es_find_extent(struct inode *inode, - struct extent_status *es); +extern ext4_lblk_t ext4_es_find_delayed_extent(struct inode *inode, + struct extent_status *es); static inline int ext4_es_is_written(struct extent_status *es) { diff --git a/fs/ext4/file.c b/fs/ext4/file.c index 209802b..d2df517 100644 --- a/fs/ext4/file.c +++ b/fs/ext4/file.c @@ -465,7 +465,7 @@ static loff_t ext4_seek_data(struct file *file, loff_t offset, loff_t maxsize) * it will be as a data. */ es.es_lblk = last; - (void)ext4_es_find_extent(inode, &es); + (void)ext4_es_find_delayed_extent(inode, &es); if (last >= es.es_lblk && last < es.es_lblk + es.es_len) { if (last != start) dataoff = last << blkbits; @@ -549,7 +549,7 @@ static loff_t ext4_seek_hole(struct file *file, loff_t offset, loff_t maxsize) * we will skip this extent. */ es.es_lblk = last; - (void)ext4_es_find_extent(inode, &es); + (void)ext4_es_find_delayed_extent(inode, &es); if (last >= es.es_lblk && last < es.es_lblk + es.es_len) { last = es.es_lblk + es.es_len; holeoff = last << blkbits; diff --git a/include/trace/events/ext4.h b/include/trace/events/ext4.h index 0ee507f..0f30a8e 100644 --- a/include/trace/events/ext4.h +++ b/include/trace/events/ext4.h @@ -2147,7 +2147,7 @@ TRACE_EVENT(ext4_es_remove_extent, __entry->lblk, __entry->len) ); -TRACE_EVENT(ext4_es_find_extent_enter, +TRACE_EVENT(ext4_es_find_delayed_extent_enter, TP_PROTO(struct inode *inode, ext4_lblk_t lblk), TP_ARGS(inode, lblk), @@ -2169,7 +2169,7 @@ TRACE_EVENT(ext4_es_find_extent_enter, (unsigned long) __entry->ino, __entry->lblk) ); -TRACE_EVENT(ext4_es_find_extent_exit, +TRACE_EVENT(ext4_es_find_delayed_extent_exit, TP_PROTO(struct inode *inode, struct extent_status *es, ext4_lblk_t ret), -- 1.7.12.rc0.22.gcdd159b -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists