diff options
| author | Alex Elder <aelder@sgi.com> | 2009-09-15 22:37:47 -0400 |
|---|---|---|
| committer | Alex Elder <aelder@sgi.com> | 2009-09-15 22:37:47 -0400 |
| commit | fdec29c5fcd2705d61c1d14a1d4c74be03e9627c (patch) | |
| tree | bcf5d4dd46b4945f3b4bec6b763ff9a9484e4e59 /fs/xfs/xfs_log_recover.c | |
| parent | 0cb583fd2862f19ea88b02eb307d11c09e51e2f8 (diff) | |
| parent | 9ef96da6ec5e1b4cf7eb8e30852cd88ec7d5fdc0 (diff) | |
Merge branch 'master' of git://oss.sgi.com/xfs/xfs into for-linus
Conflicts:
fs/xfs/linux-2.6/xfs_lrw.c
Diffstat (limited to 'fs/xfs/xfs_log_recover.c')
| -rw-r--r-- | fs/xfs/xfs_log_recover.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c index 47da2fb45377..1099395d7d6c 100644 --- a/fs/xfs/xfs_log_recover.c +++ b/fs/xfs/xfs_log_recover.c | |||
| @@ -3263,7 +3263,7 @@ xlog_recover_process_one_iunlink( | |||
| 3263 | * freeing of the inode and its removal from the list must be | 3263 | * freeing of the inode and its removal from the list must be |
| 3264 | * atomic. | 3264 | * atomic. |
| 3265 | */ | 3265 | */ |
| 3266 | void | 3266 | STATIC void |
| 3267 | xlog_recover_process_iunlinks( | 3267 | xlog_recover_process_iunlinks( |
| 3268 | xlog_t *log) | 3268 | xlog_t *log) |
| 3269 | { | 3269 | { |