diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-28 08:29:59 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-28 08:29:59 -0400 |
| commit | 185a257f2f73bcd89050ad02da5bedbc28fc43fa (patch) | |
| tree | 5e32586114534ed3f2165614cba3d578f5d87307 /fs/coda/coda_linux.c | |
| parent | 3f1a9aaeffd8d1cbc5ab9776c45cbd66af1c9699 (diff) | |
| parent | a77c64c1a641950626181b4857abb701d8f38ccc (diff) | |
Merge branch 'master' into gfs2
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) |