Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 280160
b: refs/heads/master
c: c972b4b
h: refs/heads/master
v: v3
  • Loading branch information
Al Viro committed Jan 4, 2012
1 parent 6cfc00c commit 14229eb
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 4c1d5a64f134b254552b6211f6f79a1da667eab7
refs/heads/master: c972b4bc8331b432f51a5f1bc3ca7e020172717f
5 changes: 2 additions & 3 deletions trunk/drivers/usb/core/inode.c
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ static int remount(struct super_block *sb, int *flags, char *data)
return -EINVAL;
}

if (usbfs_mount && usbfs_mount->mnt_sb)
if (usbfs_mount)
update_sb(usbfs_mount->mnt_sb);

return 0;
Expand Down Expand Up @@ -500,9 +500,8 @@ static int fs_create_by_name (const char *name, mode_t mode,
* have around.
*/
if (!parent ) {
if (usbfs_mount && usbfs_mount->mnt_sb) {
if (usbfs_mount)
parent = usbfs_mount->mnt_root;
}
}

if (!parent) {
Expand Down
2 changes: 1 addition & 1 deletion trunk/fs/configfs/dir.c
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ static int configfs_create_dir(struct config_item * item, struct dentry *dentry)

if (item->ci_parent)
parent = item->ci_parent->ci_dentry;
else if (configfs_mount && configfs_mount->mnt_sb)
else if (configfs_mount)
parent = configfs_mount->mnt_root;
else
return -EFAULT;
Expand Down

0 comments on commit 14229eb

Please sign in to comment.