diff options
| author | Len Brown <len.brown@intel.com> | 2006-06-29 19:57:46 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-06-29 19:57:46 -0400 |
| commit | d120cfb544ed6161b9d32fb6c4648c471807ee6b (patch) | |
| tree | 7757ad0198d8df76ff5c60f939a687687c41da00 /fs/xfs/xfs_inode.c | |
| parent | 9dce0e950dbfab4148f35ac6f297d8638cdc63c4 (diff) | |
| parent | bf7e8511088963078484132636839b59e25cf14f (diff) | |
merge linus into release branch
Conflicts:
drivers/acpi/acpi_memhotplug.c
Diffstat (limited to 'fs/xfs/xfs_inode.c')
| -rw-r--r-- | fs/xfs/xfs_inode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c index 5fa0adb7e173..86c1bf0bba9e 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c | |||
| @@ -1961,9 +1961,9 @@ xfs_iunlink_remove( | |||
| 1961 | xfs_agino_t agino; | 1961 | xfs_agino_t agino; |
| 1962 | xfs_agino_t next_agino; | 1962 | xfs_agino_t next_agino; |
| 1963 | xfs_buf_t *last_ibp; | 1963 | xfs_buf_t *last_ibp; |
| 1964 | xfs_dinode_t *last_dip; | 1964 | xfs_dinode_t *last_dip = NULL; |
| 1965 | short bucket_index; | 1965 | short bucket_index; |
| 1966 | int offset, last_offset; | 1966 | int offset, last_offset = 0; |
| 1967 | int error; | 1967 | int error; |
| 1968 | int agi_ok; | 1968 | int agi_ok; |
| 1969 | 1969 | ||