diff mbox

ocfs2: cleanup implemented prototypes

Message ID 57763787.4020706@huawei.com (mailing list archive)
State New, archived
Headers show

Commit Message

Joseph Qi July 1, 2016, 9:27 a.m. UTC 
Several prototypes in inode.h are just defined but not actually
implemented and used, so remove them.

Signed-off-by: Joseph Qi <joseph.qi@huawei.com>
---
 fs/ocfs2/inode.h | 7 -------
 fs/ocfs2/super.c | 1 -
 2 files changed, 8 deletions(-)

Comments

Zhen Ren July 4, 2016, 3:36 a.m. UTC | #1 
Hi Joseph,

Please see comments inline;-)

On 07/01/2016 05:27 PM, Joseph Qi wrote:
> Several prototypes in inode.h are just defined but not actually
> implemented and used, so remove them.
>
> Signed-off-by: Joseph Qi <joseph.qi@huawei.com>
> ---
>   fs/ocfs2/inode.h | 7 -------
>   fs/ocfs2/super.c | 1 -
>   2 files changed, 8 deletions(-)
>
> diff --git a/fs/ocfs2/inode.h b/fs/ocfs2/inode.h
> index d8f3fc8..50cc550 100644
> --- a/fs/ocfs2/inode.h
> +++ b/fs/ocfs2/inode.h
> @@ -145,22 +145,15 @@ int ocfs2_drop_inode(struct inode *inode);
>   struct inode *ocfs2_ilookup(struct super_block *sb, u64 feoff);
>   struct inode *ocfs2_iget(struct ocfs2_super *osb, u64 feoff, unsigned flags,
>   			 int sysfile_type);
> -int ocfs2_inode_init_private(struct inode *inode);
>   int ocfs2_inode_revalidate(struct dentry *dentry);
>   void ocfs2_populate_inode(struct inode *inode, struct ocfs2_dinode *fe,
>   			  int create_ino);
> -void ocfs2_read_inode(struct inode *inode);
> -void ocfs2_read_inode2(struct inode *inode, void *opaque);
> -ssize_t ocfs2_rw_direct(int rw, struct file *filp, char *buf,
> -			size_t size, loff_t *offp);
>   void ocfs2_sync_blockdev(struct super_block *sb);
>   void ocfs2_refresh_inode(struct inode *inode,
>   			 struct ocfs2_dinode *fe);
>   int ocfs2_mark_inode_dirty(handle_t *handle,
>   			   struct inode *inode,
>   			   struct buffer_head *bh);
> -struct buffer_head *ocfs2_bread(struct inode *inode,
> -				int block, int *err, int reada);

grep shows "ocfs2_bread" also appears in dir.c:511, could you take a
look at?

Eric

>
>   void ocfs2_set_inode_flags(struct inode *inode);
>   void ocfs2_get_inode_flags(struct ocfs2_inode_info *oi);
> diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
> index d7cae33..d97de21 100644
> --- a/fs/ocfs2/super.c
> +++ b/fs/ocfs2/super.c
> @@ -2072,7 +2072,6 @@ static int ocfs2_initialize_super(struct super_block *sb,
>   	osb->osb_dx_seed[3] = le32_to_cpu(di->id2.i_super.s_uuid_hash);
>
>   	osb->sb = sb;
> -	/* Save off for ocfs2_rw_direct */
>   	osb->s_sectsize_bits = blksize_bits(sector_size);
>   	BUG_ON(!osb->s_sectsize_bits);
>
Joseph Qi July 4, 2016, 3:48 a.m. UTC | #2 
It's comments of ocfs2_read_dir_block, I have kept it as I think it
still makes sense.

Thanks,
Joseph

On 2016/7/4 11:36, Eric Ren wrote:
> Hi Joseph,
> 
> Please see comments inline;-)
> 
> On 07/01/2016 05:27 PM, Joseph Qi wrote:
>> Several prototypes in inode.h are just defined but not actually
>> implemented and used, so remove them.
>>
>> Signed-off-by: Joseph Qi <joseph.qi@huawei.com>
>> ---
>>   fs/ocfs2/inode.h | 7 -------
>>   fs/ocfs2/super.c | 1 -
>>   2 files changed, 8 deletions(-)
>>
>> diff --git a/fs/ocfs2/inode.h b/fs/ocfs2/inode.h
>> index d8f3fc8..50cc550 100644
>> --- a/fs/ocfs2/inode.h
>> +++ b/fs/ocfs2/inode.h
>> @@ -145,22 +145,15 @@ int ocfs2_drop_inode(struct inode *inode);
>>   struct inode *ocfs2_ilookup(struct super_block *sb, u64 feoff);
>>   struct inode *ocfs2_iget(struct ocfs2_super *osb, u64 feoff, unsigned flags,
>>                int sysfile_type);
>> -int ocfs2_inode_init_private(struct inode *inode);
>>   int ocfs2_inode_revalidate(struct dentry *dentry);
>>   void ocfs2_populate_inode(struct inode *inode, struct ocfs2_dinode *fe,
>>                 int create_ino);
>> -void ocfs2_read_inode(struct inode *inode);
>> -void ocfs2_read_inode2(struct inode *inode, void *opaque);
>> -ssize_t ocfs2_rw_direct(int rw, struct file *filp, char *buf,
>> -            size_t size, loff_t *offp);
>>   void ocfs2_sync_blockdev(struct super_block *sb);
>>   void ocfs2_refresh_inode(struct inode *inode,
>>                struct ocfs2_dinode *fe);
>>   int ocfs2_mark_inode_dirty(handle_t *handle,
>>                  struct inode *inode,
>>                  struct buffer_head *bh);
>> -struct buffer_head *ocfs2_bread(struct inode *inode,
>> -                int block, int *err, int reada);
> 
> grep shows "ocfs2_bread" also appears in dir.c:511, could you take a
> look at?
> 
> Eric
> 
>>
>>   void ocfs2_set_inode_flags(struct inode *inode);
>>   void ocfs2_get_inode_flags(struct ocfs2_inode_info *oi);
>> diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
>> index d7cae33..d97de21 100644
>> --- a/fs/ocfs2/super.c
>> +++ b/fs/ocfs2/super.c
>> @@ -2072,7 +2072,6 @@ static int ocfs2_initialize_super(struct super_block *sb,
>>       osb->osb_dx_seed[3] = le32_to_cpu(di->id2.i_super.s_uuid_hash);
>>
>>       osb->sb = sb;
>> -    /* Save off for ocfs2_rw_direct */
>>       osb->s_sectsize_bits = blksize_bits(sector_size);
>>       BUG_ON(!osb->s_sectsize_bits);
>>
> 
> 
> .
>
Zhen Ren July 4, 2016, 4:58 a.m. UTC | #3 
Hi Joseph,

On 07/04/2016 11:48 AM, Joseph Qi wrote:
> It's comments of ocfs2_read_dir_block, I have kept it as I think it
> still makes sense.

Yes, I see it. Well, perhaps reword the comments is better? Comment with
a no longer existing function name is confusing, anyway;-)

> Thanks,
> Joseph
>
> On 2016/7/4 11:36, Eric Ren wrote:
>> Hi Joseph,
>>
>> Please see comments inline;-)
>>
>> On 07/01/2016 05:27 PM, Joseph Qi wrote:
>>> Several prototypes in inode.h are just defined but not actually
>>> implemented and used, so remove them.
>>>
>>> Signed-off-by: Joseph Qi <joseph.qi@huawei.com>
>>> ---
>>>    fs/ocfs2/inode.h | 7 -------
>>>    fs/ocfs2/super.c | 1 -
>>>    2 files changed, 8 deletions(-)
>>>
>>> diff --git a/fs/ocfs2/inode.h b/fs/ocfs2/inode.h
>>> index d8f3fc8..50cc550 100644
>>> --- a/fs/ocfs2/inode.h
>>> +++ b/fs/ocfs2/inode.h
>>> @@ -145,22 +145,15 @@ int ocfs2_drop_inode(struct inode *inode);
>>>    struct inode *ocfs2_ilookup(struct super_block *sb, u64 feoff);
>>>    struct inode *ocfs2_iget(struct ocfs2_super *osb, u64 feoff, unsigned flags,
>>>                 int sysfile_type);
>>> -int ocfs2_inode_init_private(struct inode *inode);
>>>    int ocfs2_inode_revalidate(struct dentry *dentry);
>>>    void ocfs2_populate_inode(struct inode *inode, struct ocfs2_dinode *fe,
>>>                  int create_ino);
>>> -void ocfs2_read_inode(struct inode *inode);
>>> -void ocfs2_read_inode2(struct inode *inode, void *opaque);
>>> -ssize_t ocfs2_rw_direct(int rw, struct file *filp, char *buf,
>>> -            size_t size, loff_t *offp);
>>>    void ocfs2_sync_blockdev(struct super_block *sb);
>>>    void ocfs2_refresh_inode(struct inode *inode,
>>>                 struct ocfs2_dinode *fe);
>>>    int ocfs2_mark_inode_dirty(handle_t *handle,
>>>                   struct inode *inode,
>>>                   struct buffer_head *bh);
>>> -struct buffer_head *ocfs2_bread(struct inode *inode,
>>> -                int block, int *err, int reada);
>>
>> grep shows "ocfs2_bread" also appears in dir.c:511, could you take a
>> look at?
>>
>> Eric
>>
>>>
>>>    void ocfs2_set_inode_flags(struct inode *inode);
>>>    void ocfs2_get_inode_flags(struct ocfs2_inode_info *oi);
>>> diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
>>> index d7cae33..d97de21 100644
>>> --- a/fs/ocfs2/super.c
>>> +++ b/fs/ocfs2/super.c
>>> @@ -2072,7 +2072,6 @@ static int ocfs2_initialize_super(struct super_block *sb,
>>>        osb->osb_dx_seed[3] = le32_to_cpu(di->id2.i_super.s_uuid_hash);
>>>
>>>        osb->sb = sb;
>>> -    /* Save off for ocfs2_rw_direct */
>>>        osb->s_sectsize_bits = blksize_bits(sector_size);
>>>        BUG_ON(!osb->s_sectsize_bits);
>>>
>>
>>
>> .
>>
>
>
>
diff mbox

Patch

diff --git a/fs/ocfs2/inode.h b/fs/ocfs2/inode.h
index d8f3fc8..50cc550 100644
--- a/fs/ocfs2/inode.h
+++ b/fs/ocfs2/inode.h
@@ -145,22 +145,15 @@  int ocfs2_drop_inode(struct inode *inode);
 struct inode *ocfs2_ilookup(struct super_block *sb, u64 feoff);
 struct inode *ocfs2_iget(struct ocfs2_super *osb, u64 feoff, unsigned flags,
 			 int sysfile_type);
-int ocfs2_inode_init_private(struct inode *inode);
 int ocfs2_inode_revalidate(struct dentry *dentry);
 void ocfs2_populate_inode(struct inode *inode, struct ocfs2_dinode *fe,
 			  int create_ino);
-void ocfs2_read_inode(struct inode *inode);
-void ocfs2_read_inode2(struct inode *inode, void *opaque);
-ssize_t ocfs2_rw_direct(int rw, struct file *filp, char *buf,
-			size_t size, loff_t *offp);
 void ocfs2_sync_blockdev(struct super_block *sb);
 void ocfs2_refresh_inode(struct inode *inode,
 			 struct ocfs2_dinode *fe);
 int ocfs2_mark_inode_dirty(handle_t *handle,
 			   struct inode *inode,
 			   struct buffer_head *bh);
-struct buffer_head *ocfs2_bread(struct inode *inode,
-				int block, int *err, int reada);

 void ocfs2_set_inode_flags(struct inode *inode);
 void ocfs2_get_inode_flags(struct ocfs2_inode_info *oi);
diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
index d7cae33..d97de21 100644
--- a/fs/ocfs2/super.c
+++ b/fs/ocfs2/super.c
@@ -2072,7 +2072,6 @@  static int ocfs2_initialize_super(struct super_block *sb,
 	osb->osb_dx_seed[3] = le32_to_cpu(di->id2.i_super.s_uuid_hash);

 	osb->sb = sb;
-	/* Save off for ocfs2_rw_direct */
 	osb->s_sectsize_bits = blksize_bits(sector_size);
 	BUG_ON(!osb->s_sectsize_bits);