Skip to content

Commit

Permalink
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
Browse files Browse the repository at this point in the history
* git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
  Btrfs: check file pointer in btrfs_sync_file
  • Loading branch information
Linus Torvalds committed Feb 21, 2009
2 parents b6adea3 + 2cfbd50 commit 264b299
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions fs/btrfs/file.c
Original file line number Diff line number Diff line change
Expand Up @@ -1222,7 +1222,7 @@ int btrfs_sync_file(struct file *file, struct dentry *dentry, int datasync)
/*
* ok we haven't committed the transaction yet, lets do a commit
*/
if (file->private_data)
if (file && file->private_data)
btrfs_ioctl_trans_end(file);

trans = btrfs_start_transaction(root, 1);
Expand All @@ -1231,7 +1231,7 @@ int btrfs_sync_file(struct file *file, struct dentry *dentry, int datasync)
goto out;
}

ret = btrfs_log_dentry_safe(trans, root, file->f_dentry);
ret = btrfs_log_dentry_safe(trans, root, dentry);
if (ret < 0)
goto out;

Expand All @@ -1245,15 +1245,15 @@ int btrfs_sync_file(struct file *file, struct dentry *dentry, int datasync)
* file again, but that will end up using the synchronization
* inside btrfs_sync_log to keep things safe.
*/
mutex_unlock(&file->f_dentry->d_inode->i_mutex);
mutex_unlock(&dentry->d_inode->i_mutex);

if (ret > 0) {
ret = btrfs_commit_transaction(trans, root);
} else {
btrfs_sync_log(trans, root);
ret = btrfs_end_transaction(trans, root);
}
mutex_lock(&file->f_dentry->d_inode->i_mutex);
mutex_lock(&dentry->d_inode->i_mutex);
out:
return ret > 0 ? EIO : ret;
}
Expand Down

0 comments on commit 264b299

Please sign in to comment.