Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 219851
b: refs/heads/master
c: 4c40448
h: refs/heads/master
i:
  219849: 86b4077
  219847: 49aa222
v: v3
  • Loading branch information
David Cross authored and Greg Kroah-Hartman committed Sep 14, 2010
1 parent 60dd386 commit a36f8a3
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 43 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: 72bbd9bce41276d06b6b816df21aced71b1896eb
refs/heads/master: 4c404487aa3d26bf7a7e16f8545778385e06d839
42 changes: 0 additions & 42 deletions trunk/drivers/staging/westbridge/astoria/gadget/cyasgadget.c
Original file line number Diff line number Diff line change
Expand Up @@ -1149,11 +1149,9 @@ static int cyasgadget_ioctl(
struct inode *inode = mapping->host;
struct inode *alloc_inode =
file_to_allocate->f_path.dentry->d_inode;
int cluster = 0;
uint32_t num_clusters = 0;
struct buffer_head bh;
struct kstat stat;
struct iattr alloc_iattr;
int nr_pages = 0;
int ret_stat = 0;

Expand Down Expand Up @@ -1188,47 +1186,7 @@ static int cyasgadget_ioctl(
/* block size is arbitrary , we'll use sector size*/
bh.b_size = SECTOR_SIZE ;

#ifndef WESTBRIDGE_NDEBUG
cy_as_hal_print_message("%s: getting fat blocks %d "
"size of %d\n", __func__,
num_clusters, bh.b_size);
#endif
for (cluster = 0; cluster < num_clusters; cluster++) {
ret_stat = fat_get_block(inode,
cluster, &bh, 1);
if (ret_stat) {
cy_as_hal_print_message(
"%s: unable to get fat block, "
"ret_stat=0x%d\n",
__func__, ret_stat);
goto initsoj_safe_exit;
}
}

#ifndef WESTBRIDGE_NDEBUG
cy_as_hal_print_message("%s: allocated clusters "
"successfully (fat_get_block), check bmap..."
"\n", __func__);
#endif

alloc_iattr.ia_valid = ATTR_SIZE;
alloc_iattr.ia_size = k_d.num_bytes;

#ifndef WESTBRIDGE_NDEBUG
cy_as_hal_print_message("%s: calling fat_notify_change "
"(ia_valid:%d, ia_size:%d)\n", __func__,
alloc_iattr.ia_valid,
(int)alloc_iattr.ia_size);
#endif

/* adjust the filesize */
ret_stat = alloc_inode->i_op->setattr(
file_to_allocate->f_path.dentry, &alloc_iattr);
#ifndef WESTBRIDGE_NDEBUG
cy_as_hal_print_message("%s: fat_setattr() "
"returned 0x%x\n",
__func__, ret_stat);
#endif

/* clear dirty pages in page cache
* (if were any allocated) */
Expand Down

0 comments on commit a36f8a3

Please sign in to comment.