diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-27 18:16:47 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-27 18:16:47 -0400 |
| commit | 3b9f6cb8a1ec791be79c6c7595fea922f12d1e64 (patch) | |
| tree | 2393a448add846e6c2ed12f68106c3018b72c6a9 /fs/coda/coda_linux.c | |
| parent | c38778c3a9aeadcd1ee319cfc8ea5a9cbf8cdafa (diff) | |
| parent | a77c64c1a641950626181b4857abb701d8f38ccc (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'fs/coda/coda_linux.c')
| -rw-r--r-- | fs/coda/coda_linux.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/coda/coda_linux.c b/fs/coda/coda_linux.c index 5597080cb811..95a54253c047 100644 --- a/fs/coda/coda_linux.c +++ b/fs/coda/coda_linux.c | |||
| @@ -110,8 +110,6 @@ void coda_vattr_to_iattr(struct inode *inode, struct coda_vattr *attr) | |||
| 110 | inode->i_nlink = attr->va_nlink; | 110 | inode->i_nlink = attr->va_nlink; |
| 111 | if (attr->va_size != -1) | 111 | if (attr->va_size != -1) |
| 112 | inode->i_size = attr->va_size; | 112 | inode->i_size = attr->va_size; |
| 113 | if (attr->va_blocksize != -1) | ||
| 114 | inode->i_blksize = attr->va_blocksize; | ||
| 115 | if (attr->va_size != -1) | 113 | if (attr->va_size != -1) |
| 116 | inode->i_blocks = (attr->va_size + 511) >> 9; | 114 | inode->i_blocks = (attr->va_size + 511) >> 9; |
| 117 | if (attr->va_atime.tv_sec != -1) | 115 | if (attr->va_atime.tv_sec != -1) |