VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)

[linux-2.6.git] / fs / xfs / xfs_inode.h

diff --git a/fs/xfs/xfs_inode.h b/fs/xfs/xfs_inode.h
index aa07ce3..f606073 100644 (file)
--- a/fs/xfs/xfs_inode.h
+++ b/fs/xfs/xfs_inode.h
@@ -459,8 +459,8 @@ xfs_inode_t *xfs_bhvtoi(struct bhv_desc *bhvp);
  * directory, group of new file is set to that of the parent, and
  * new subdirectory gets S_ISGID bit from parent.
  */
-#define XFS_INHERIT_GID(pip, vfsp)     ((pip) != NULL && \
-       (((vfsp)->vfs_flag & VFS_GRPID) || ((pip)->i_d.di_mode & S_ISGID)))
+#define XFS_INHERIT_GID(pip, vfsp)     \
+       (((vfsp)->vfs_flag & VFS_GRPID) || ((pip)->i_d.di_mode & S_ISGID))
 
 /*
  * xfs_iget.c prototypes.
@@ -503,8 +503,9 @@ int         xfs_iread_extents(struct xfs_trans *, xfs_inode_t *, int);
 int            xfs_ialloc(struct xfs_trans *, xfs_inode_t *, mode_t, nlink_t,
                           xfs_dev_t, struct cred *, xfs_prid_t, int,
                           struct xfs_buf **, boolean_t *, xfs_inode_t **);
-void           xfs_xlate_dinode_core(xfs_caddr_t, struct xfs_dinode_core *, int,
-                          xfs_arch_t);
+void           xfs_xlate_dinode_core(xfs_caddr_t, struct xfs_dinode_core *,
+                                       int, xfs_arch_t);
+uint           xfs_dic2xflags(struct xfs_dinode_core *, xfs_arch_t);
 int            xfs_ifree(struct xfs_trans *, xfs_inode_t *,
                           struct xfs_bmap_free *);
 int            xfs_atruncate_start(xfs_inode_t *);