diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-27 18:13:53 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-27 18:13:53 -0400 |
| commit | aebb1153ac54ddbbd3d3f0481a193f4bf0ead53b (patch) | |
| tree | 57425aa83c8bed5b41af7e3408024fe1f2fdded9 /include/linux/smb.h | |
| parent | 022e7a12b6aa11a11de4d708fe8606c9a6734b37 (diff) | |
| parent | a77c64c1a641950626181b4857abb701d8f38ccc (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'include/linux/smb.h')
| -rw-r--r-- | include/linux/smb.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/smb.h b/include/linux/smb.h index 6df3b1501559..f098dff93f6b 100644 --- a/include/linux/smb.h +++ b/include/linux/smb.h | |||
| @@ -89,7 +89,6 @@ struct smb_fattr { | |||
| 89 | struct timespec f_atime; | 89 | struct timespec f_atime; |
| 90 | struct timespec f_mtime; | 90 | struct timespec f_mtime; |
| 91 | struct timespec f_ctime; | 91 | struct timespec f_ctime; |
| 92 | unsigned long f_blksize; | ||
| 93 | unsigned long f_blocks; | 92 | unsigned long f_blocks; |
| 94 | int f_unix; | 93 | int f_unix; |
| 95 | }; | 94 | }; |