diff options
| author | J. Bruce Fields <bfields@citi.umich.edu> | 2010-05-04 11:27:05 -0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@citi.umich.edu> | 2010-05-04 11:29:05 -0400 |
| commit | 5306293c9cd2caf41849cc909281bda628bb989e (patch) | |
| tree | 3be4e8231e2772c8a43ddbef5c6a72c20b3054bb /fs/jfs/jfs_imap.c | |
| parent | dbd65a7e44fff4741a0b2c84bd6bace85d22c242 (diff) | |
| parent | 66f41d4c5c8a5deed66fdcc84509376c9a0bf9d8 (diff) | |
Merge commit 'v2.6.34-rc6'
Conflicts:
fs/nfsd/nfs4callback.c
Diffstat (limited to 'fs/jfs/jfs_imap.c')
| -rw-r--r-- | fs/jfs/jfs_imap.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/jfs/jfs_imap.c b/fs/jfs/jfs_imap.c index 0fc30407f039..f8332dc8eeb2 100644 --- a/fs/jfs/jfs_imap.c +++ b/fs/jfs/jfs_imap.c | |||
| @@ -45,6 +45,7 @@ | |||
| 45 | #include <linux/buffer_head.h> | 45 | #include <linux/buffer_head.h> |
| 46 | #include <linux/pagemap.h> | 46 | #include <linux/pagemap.h> |
| 47 | #include <linux/quotaops.h> | 47 | #include <linux/quotaops.h> |
| 48 | #include <linux/slab.h> | ||
| 48 | 49 | ||
| 49 | #include "jfs_incore.h" | 50 | #include "jfs_incore.h" |
| 50 | #include "jfs_inode.h" | 51 | #include "jfs_inode.h" |