mirror of
https://github.com/torvalds/linux
synced 2024-09-20 11:07:02 +00:00
bb8d8a6f54
This patch fixes some sign issues which were accidentally introduced into the quota & statfs code during the endianess annotation process. Also included is a general clean up which moves all of the _host structures out of gfs2_ondisk.h (where they should not have been to start with) and into the places where they are actually used (often only one place). Also those _host structures which are not required any more are removed entirely (which is the eventual plan for all of them). The conversion routines from ondisk.c are also moved into the places where they are actually used, which for almost every one, was just one single place, so all those are now static functions. This also cleans up the end of gfs2_ondisk.h which no longer needs the #ifdef __KERNEL__. The net result is a reduction of about 100 lines of code, many functions now marked static plus the bug fixes as mentioned above. For good measure I ran the code through sparse after making these changes to check that there are no warnings generated. This fixes Red Hat bz #239686 Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
75 lines
2.5 KiB
C
75 lines
2.5 KiB
C
/*
|
|
* Copyright (C) Sistina Software, Inc. 1997-2003 All rights reserved.
|
|
* Copyright (C) 2004-2006 Red Hat, Inc. All rights reserved.
|
|
*
|
|
* This copyrighted material is made available to anyone wishing to use,
|
|
* modify, copy, or redistribute it subject to the terms and conditions
|
|
* of the GNU General Public License version 2.
|
|
*/
|
|
|
|
#ifndef __INODE_DOT_H__
|
|
#define __INODE_DOT_H__
|
|
|
|
static inline int gfs2_is_stuffed(const struct gfs2_inode *ip)
|
|
{
|
|
return !ip->i_di.di_height;
|
|
}
|
|
|
|
static inline int gfs2_is_jdata(const struct gfs2_inode *ip)
|
|
{
|
|
return ip->i_di.di_flags & GFS2_DIF_JDATA;
|
|
}
|
|
|
|
static inline int gfs2_is_dir(const struct gfs2_inode *ip)
|
|
{
|
|
return S_ISDIR(ip->i_inode.i_mode);
|
|
}
|
|
|
|
static inline void gfs2_set_inode_blocks(struct inode *inode)
|
|
{
|
|
struct gfs2_inode *ip = GFS2_I(inode);
|
|
inode->i_blocks = ip->i_di.di_blocks <<
|
|
(GFS2_SB(inode)->sd_sb.sb_bsize_shift - GFS2_BASIC_BLOCK_SHIFT);
|
|
}
|
|
|
|
static inline int gfs2_check_inum(const struct gfs2_inode *ip, u64 no_addr,
|
|
u64 no_formal_ino)
|
|
{
|
|
return ip->i_no_addr == no_addr && ip->i_no_formal_ino == no_formal_ino;
|
|
}
|
|
|
|
static inline void gfs2_inum_out(const struct gfs2_inode *ip,
|
|
struct gfs2_dirent *dent)
|
|
{
|
|
dent->de_inum.no_formal_ino = cpu_to_be64(ip->i_no_formal_ino);
|
|
dent->de_inum.no_addr = cpu_to_be64(ip->i_no_addr);
|
|
}
|
|
|
|
|
|
void gfs2_inode_attr_in(struct gfs2_inode *ip);
|
|
struct inode *gfs2_inode_lookup(struct super_block *sb, u64 no_addr, unsigned type);
|
|
struct inode *gfs2_ilookup(struct super_block *sb, u64 no_addr);
|
|
|
|
int gfs2_inode_refresh(struct gfs2_inode *ip);
|
|
|
|
int gfs2_dinode_dealloc(struct gfs2_inode *inode);
|
|
int gfs2_change_nlink(struct gfs2_inode *ip, int diff);
|
|
struct inode *gfs2_lookupi(struct inode *dir, const struct qstr *name,
|
|
int is_root, struct nameidata *nd);
|
|
struct inode *gfs2_createi(struct gfs2_holder *ghs, const struct qstr *name,
|
|
unsigned int mode, dev_t dev);
|
|
int gfs2_rmdiri(struct gfs2_inode *dip, const struct qstr *name,
|
|
struct gfs2_inode *ip);
|
|
int gfs2_unlink_ok(struct gfs2_inode *dip, const struct qstr *name,
|
|
const struct gfs2_inode *ip);
|
|
int gfs2_ok_to_move(struct gfs2_inode *this, struct gfs2_inode *to);
|
|
int gfs2_readlinki(struct gfs2_inode *ip, char **buf, unsigned int *len);
|
|
int gfs2_glock_nq_atime(struct gfs2_holder *gh);
|
|
int gfs2_setattr_simple(struct gfs2_inode *ip, struct iattr *attr);
|
|
struct inode *gfs2_lookup_simple(struct inode *dip, const char *name);
|
|
void gfs2_dinode_out(const struct gfs2_inode *ip, void *buf);
|
|
void gfs2_dinode_print(const struct gfs2_inode *ip);
|
|
|
|
#endif /* __INODE_DOT_H__ */
|
|
|