Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6cb129f5 authored by Adrian Bunk's avatar Adrian Bunk Committed by Mark Fasheh
Browse files

[PATCH] fs/ocfs2/: make 3 functions static 



This patch makes the following needlessly global functions static:
- aops.c: ocfs2_write_data_page()
- dlmglue.c: ocfs2_dump_meta_lvb_info()
- file.c: ocfs2_set_inode_size()

Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarMark Fasheh <mark.fasheh@oracle.com>
parent 586d232b

fs/ocfs2/aops.c

+3 −3
Original line number Diff line number Diff line
@@ -939,7 +939,7 @@ out: 
 * Returns a negative error code or the number of bytes copied into

 * the page.

 */

int ocfs2_write_data_page(struct inode *inode, handle_t *handle,

static int ocfs2_write_data_page(struct inode *inode, handle_t *handle,

				 u64 *p_blkno, struct page *page,

				 struct ocfs2_write_ctxt *wc, int new)

{

fs/ocfs2/dlmglue.c

+29 −25
Original line number Diff line number Diff line
@@ -104,6 +104,35 @@ static int ocfs2_dentry_convert_worker(struct ocfs2_lock_res *lockres, 
static void ocfs2_dentry_post_unlock(struct ocfs2_super *osb,

				     struct ocfs2_lock_res *lockres);





#define mlog_meta_lvb(__level, __lockres) ocfs2_dump_meta_lvb_info(__level, __PRETTY_FUNCTION__, __LINE__, __lockres)



/* This aids in debugging situations where a bad LVB might be involved. */

static void ocfs2_dump_meta_lvb_info(u64 level,

				     const char *function,

				     unsigned int line,

				     struct ocfs2_lock_res *lockres)

{

	struct ocfs2_meta_lvb *lvb = (struct ocfs2_meta_lvb *) lockres->l_lksb.lvb;



	mlog(level, "LVB information for %s (called from %s:%u):\n",

	     lockres->l_name, function, line);

	mlog(level, "version: %u, clusters: %u, generation: 0x%x\n",

	     lvb->lvb_version, be32_to_cpu(lvb->lvb_iclusters),

	     be32_to_cpu(lvb->lvb_igeneration));

	mlog(level, "size: %llu, uid %u, gid %u, mode 0x%x\n",

	     (unsigned long long)be64_to_cpu(lvb->lvb_isize),

	     be32_to_cpu(lvb->lvb_iuid), be32_to_cpu(lvb->lvb_igid),

	     be16_to_cpu(lvb->lvb_imode));

	mlog(level, "nlink %u, atime_packed 0x%llx, ctime_packed 0x%llx, "

	     "mtime_packed 0x%llx iattr 0x%x\n", be16_to_cpu(lvb->lvb_inlink),

	     (long long)be64_to_cpu(lvb->lvb_iatime_packed),

	     (long long)be64_to_cpu(lvb->lvb_ictime_packed),

	     (long long)be64_to_cpu(lvb->lvb_imtime_packed),

	     be32_to_cpu(lvb->lvb_iattr));

}





/*

 * OCFS2 Lock Resource Operations

 *
@@ -3078,28 +3107,3 @@ static void ocfs2_schedule_blocked_lock(struct ocfs2_super *osb, 


	mlog_exit_void();

}
 


/* This aids in debugging situations where a bad LVB might be involved. */

void ocfs2_dump_meta_lvb_info(u64 level,

			      const char *function,

			      unsigned int line,

			      struct ocfs2_lock_res *lockres)

{

	struct ocfs2_meta_lvb *lvb = (struct ocfs2_meta_lvb *) lockres->l_lksb.lvb;



	mlog(level, "LVB information for %s (called from %s:%u):\n",

	     lockres->l_name, function, line);

	mlog(level, "version: %u, clusters: %u, generation: 0x%x\n",

	     lvb->lvb_version, be32_to_cpu(lvb->lvb_iclusters),

	     be32_to_cpu(lvb->lvb_igeneration));

	mlog(level, "size: %llu, uid %u, gid %u, mode 0x%x\n",

	     (unsigned long long)be64_to_cpu(lvb->lvb_isize),

	     be32_to_cpu(lvb->lvb_iuid), be32_to_cpu(lvb->lvb_igid),

	     be16_to_cpu(lvb->lvb_imode));

	mlog(level, "nlink %u, atime_packed 0x%llx, ctime_packed 0x%llx, "

	     "mtime_packed 0x%llx iattr 0x%x\n", be16_to_cpu(lvb->lvb_inlink),

	     (long long)be64_to_cpu(lvb->lvb_iatime_packed),

	     (long long)be64_to_cpu(lvb->lvb_ictime_packed),

	     (long long)be64_to_cpu(lvb->lvb_imtime_packed),

	     be32_to_cpu(lvb->lvb_iattr));

}

fs/ocfs2/dlmglue.h

+0 −7
Original line number Diff line number Diff line
@@ -119,11 +119,4 @@ void ocfs2_process_blocked_lock(struct ocfs2_super *osb, 
struct ocfs2_dlm_debug *ocfs2_new_dlm_debug(void);

void ocfs2_put_dlm_debug(struct ocfs2_dlm_debug *dlm_debug);



/* aids in debugging and tracking lvbs */

void ocfs2_dump_meta_lvb_info(u64 level,

			      const char *function,

			      unsigned int line,

			      struct ocfs2_lock_res *lockres);

#define mlog_meta_lvb(__level, __lockres) ocfs2_dump_meta_lvb_info(__level, __PRETTY_FUNCTION__, __LINE__, __lockres)



#endif	/* DLMGLUE_H */

fs/ocfs2/file.c

+4 −4
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ out: 
	return ret;

}



int ocfs2_set_inode_size(handle_t *handle,

static int ocfs2_set_inode_size(handle_t *handle,

				struct inode *inode,

				struct buffer_head *fe_bh,

				u64 new_i_size)

fs/ocfs2/file.h

+0 −5
Original line number Diff line number Diff line
@@ -56,11 +56,6 @@ int ocfs2_getattr(struct vfsmount *mnt, struct dentry *dentry, 
int ocfs2_permission(struct inode *inode, int mask,

		     struct nameidata *nd);



int ocfs2_set_inode_size(handle_t *handle,

			 struct inode *inode,

			 struct buffer_head *fe_bh,

			 u64 new_i_size);



int ocfs2_should_update_atime(struct inode *inode,

			      struct vfsmount *vfsmnt);

int ocfs2_update_inode_atime(struct inode *inode,