Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 190900
b: refs/heads/master
c: d34e14f
h: refs/heads/master
v: v3
  • Loading branch information
Linus Torvalds committed May 16, 2010
1 parent a6ca0ff commit 94067fb
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 3 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: 4e73238d163c6fcf001264832701d2a6d4927672
refs/heads/master: d34e14f690d611ffe3db09e4ed8123d86c89a831
2 changes: 1 addition & 1 deletion trunk/drivers/mmc/host/at91_mci.c
Original file line number Diff line number Diff line change
Expand Up @@ -314,8 +314,8 @@ static void at91_mci_post_dma_read(struct at91mci_host *host)
dmabuf = (unsigned *)tmpv;
}

flush_kernel_dcache_page(sg_page(sg));
kunmap_atomic(sgbuffer, KM_BIO_SRC_IRQ);
dmac_flush_range((void *)sgbuffer, ((void *)sgbuffer) + amount);
data->bytes_xfered += amount;
if (size == 0)
break;
Expand Down
5 changes: 5 additions & 0 deletions trunk/fs/btrfs/ioctl.c
Original file line number Diff line number Diff line change
Expand Up @@ -1481,12 +1481,17 @@ static noinline long btrfs_ioctl_clone(struct file *file, unsigned long srcfd,
ret = -EBADF;
goto out_drop_write;
}

src = src_file->f_dentry->d_inode;

ret = -EINVAL;
if (src == inode)
goto out_fput;

/* the src must be open for reading */
if (!(src_file->f_mode & FMODE_READ))
goto out_fput;

ret = -EISDIR;
if (S_ISDIR(src->i_mode) || S_ISDIR(inode->i_mode))
goto out_fput;
Expand Down
3 changes: 2 additions & 1 deletion trunk/lib/btree.c
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,8 @@ static unsigned long *btree_node_alloc(struct btree_head *head, gfp_t gfp)
unsigned long *node;

node = mempool_alloc(head->mempool, gfp);
memset(node, 0, NODESIZE);
if (likely(node))
memset(node, 0, NODESIZE);
return node;
}

Expand Down

0 comments on commit 94067fb

Please sign in to comment.