diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-08-11 07:36:51 (GMT) |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-08-11 07:36:51 (GMT) |
| commit | 6396fc3b3ff3f6b942992b653a62df11dcef9bea (patch) | |
| tree | db3c7cbe833b43c653adc99f70941431c5ff7c4e /fs/bfs/bfs.h | |
| parent | 4785879e4d340e24e54f6de2ccfc42728b912808 (diff) | |
| parent | 3d30701b58970425e1d45994d6cb82f828924fdd (diff) | |
| download | linux-fsl-qoriq-6396fc3b3ff3f6b942992b653a62df11dcef9bea.tar.xz | |
Merge branch 'master' into for-next
Conflicts:
fs/exofs/inode.c
Diffstat (limited to 'fs/bfs/bfs.h')
| -rw-r--r-- | fs/bfs/bfs.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/bfs/bfs.h b/fs/bfs/bfs.h index 7109e45..f7f87e2 100644 --- a/fs/bfs/bfs.h +++ b/fs/bfs/bfs.h @@ -17,7 +17,6 @@ struct bfs_sb_info { unsigned long si_lf_eblk; unsigned long si_lasti; unsigned long *si_imap; - struct buffer_head *si_sbh; /* buffer header w/superblock */ struct mutex bfs_lock; }; |