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 /include/linux/smb.h | |
| parent | c38778c3a9aeadcd1ee319cfc8ea5a9cbf8cdafa (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 | }; |