[XFS] Remove PBF_MAPPABLE

SGI Modid: xfs-linux:xfs-kern:166087a

diff --git a/fs/xfs/linux/xfs_buf.c b/fs/xfs/linux/xfs_buf.c
index 5c9a41c309d3cfefa80ec7d0da13e5c0d0459d5a..44fe9669e59a1784b43427d7b4184f91d539091d 100644 (file)
--- a/fs/xfs/linux/xfs_buf.c
+++ b/fs/xfs/linux/xfs_buf.c
@@ -470,10 +470,8 @@ _pagebuf_lookup_pages(
                retry_count = 0;
        } else if (flags & PBF_DONT_BLOCK) {
                gfp_mask = GFP_NOFS;
-       } else if (flags & PBF_MAPPABLE) {
-               gfp_mask = GFP_KERNEL;
        } else {
-               gfp_mask = GFP_HIGHUSER;
+               gfp_mask = GFP_KERNEL;
        }
 
        next_buffer_offset = pb->pb_file_offset + pb->pb_buffer_length;
@@ -708,8 +706,7 @@ found:
        }
 
        if (pb->pb_flags & PBF_STALE)
-               pb->pb_flags &= PBF_MAPPABLE | \
-                               PBF_MAPPED | \
+               pb->pb_flags &= PBF_MAPPED | \
                                _PBF_ALL_PAGES_MAPPED | \
                                _PBF_ADDR_ALLOCATED | \
                                _PBF_MEM_ALLOCATED | \
@@ -856,7 +853,7 @@ pagebuf_readahead(
        if (bdi_write_congested(bdi))
                return;
 
-       flags |= (PBF_TRYLOCK|PBF_READ|PBF_ASYNC|PBF_MAPPABLE|PBF_READ_AHEAD);
+       flags |= (PBF_TRYLOCK|PBF_READ|PBF_ASYNC|PBF_READ_AHEAD);
        pagebuf_get(target, ioff, isize, flags);
 }
 

diff --git a/fs/xfs/linux/xfs_buf.h b/fs/xfs/linux/xfs_buf.h
index 80374761c29b4e8d85d6dabb797d0449b93426fb..4377710fd370b4d6d19bd8a6f0333adaaa27ac33 100644 (file)
--- a/fs/xfs/linux/xfs_buf.h
+++ b/fs/xfs/linux/xfs_buf.h
@@ -77,7 +77,6 @@ typedef enum page_buf_flags_e {               /* pb_flags values */
        PBF_NONE = (1 << 5),    /* buffer not read at all                  */
        PBF_DELWRI = (1 << 6),  /* buffer has dirty pages                  */
        PBF_SYNC = (1 << 8),    /* force updates to disk                   */
-       PBF_MAPPABLE = (1 << 9),/* use directly-addressable pages          */
        PBF_STALE = (1 << 10),  /* buffer has been staled, do not find it  */
        PBF_FS_MANAGED = (1 << 11), /* filesystem controls freeing memory  */
        PBF_FS_DATAIOD = (1 << 12), /* schedule IO completion on fs datad  */
@@ -508,17 +507,15 @@ extern inline xfs_caddr_t xfs_buf_offset(page_buf_t *bp, size_t offset)
 
 #define xfs_buf_read(target, blkno, len, flags) \
                pagebuf_get((target), (blkno), (len), \
-                       PBF_LOCK | PBF_READ | PBF_MAPPED | PBF_MAPPABLE)
+                       PBF_LOCK | PBF_READ | PBF_MAPPED)
 #define xfs_buf_get(target, blkno, len, flags) \
                pagebuf_get((target), (blkno), (len), \
-                       PBF_LOCK | PBF_MAPPED | PBF_MAPPABLE)
+                       PBF_LOCK | PBF_MAPPED)
 
 #define xfs_buf_read_flags(target, blkno, len, flags) \
-               pagebuf_get((target), (blkno), (len), \
-                       PBF_READ | PBF_MAPPABLE | flags)
+               pagebuf_get((target), (blkno), (len), PBF_READ | (flags))
 #define xfs_buf_get_flags(target, blkno, len, flags) \
-               pagebuf_get((target), (blkno), (len), \
-                       PBF_MAPPABLE | flags)
+               pagebuf_get((target), (blkno), (len), (flags))
 
 static inline int      xfs_bawrite(void *mp, page_buf_t *bp)
 {