Commit 1f152c17 authored by Nathan Scott's avatar Nathan Scott

[XFS] Remove a couple of redundant NULL parent inode pointer checks.

SGI Modid: xfs-linux:xfs-kern:173033a
Signed-off-by: nathans@sgi.com
parent 856f546e
...@@ -1140,8 +1140,7 @@ xfs_ialloc( ...@@ -1140,8 +1140,7 @@ xfs_ialloc(
* Call the space management code to pick * Call the space management code to pick
* the on-disk inode to be allocated. * the on-disk inode to be allocated.
*/ */
ASSERT(pip != NULL); error = xfs_dialloc(tp, pip->i_ino, mode, okalloc,
error = xfs_dialloc(tp, pip ? pip->i_ino : 0, mode, okalloc,
ialloc_context, call_again, &ino); ialloc_context, call_again, &ino);
if (error != 0) { if (error != 0) {
return error; return error;
......
...@@ -459,8 +459,8 @@ xfs_inode_t *xfs_bhvtoi(struct bhv_desc *bhvp); ...@@ -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 * directory, group of new file is set to that of the parent, and
* new subdirectory gets S_ISGID bit from parent. * new subdirectory gets S_ISGID bit from parent.
*/ */
#define XFS_INHERIT_GID(pip, vfsp) ((pip) != NULL && \ #define XFS_INHERIT_GID(pip, vfsp) \
(((vfsp)->vfs_flag & VFS_GRPID) || ((pip)->i_d.di_mode & S_ISGID))) (((vfsp)->vfs_flag & VFS_GRPID) || ((pip)->i_d.di_mode & S_ISGID))
/* /*
* xfs_iget.c prototypes. * xfs_iget.c prototypes.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment