xfs: remove the unused XFS_ALLOC_USERDATA flag

Signed-off-by: Christoph Hellwig <[email protected]>
Reviewed-by: Darrick J. Wong <[email protected]>
Signed-off-by: Darrick J. Wong <[email protected]>

diff --git a/fs/xfs/libxfs/xfs_alloc.h b/fs/xfs/libxfs/xfs_alloc.h
index d6ed5d2c07c210446e999f9a99bfd2984abfffc1..58fa85cec325e869e399f3d4e03828b1fa165134 100644 (file)
--- a/fs/xfs/libxfs/xfs_alloc.h
+++ b/fs/xfs/libxfs/xfs_alloc.h
@@ -81,10 +81,9 @@ typedef struct xfs_alloc_arg {
 /*
  * Defines for datatype
  */
 /*
  * Defines for datatype
  */

-#define XFS_ALLOC_USERDATA             (1 << 0)/* allocation is for user data*/
-#define XFS_ALLOC_INITIAL_USER_DATA    (1 << 1)/* special case start of file */
-#define XFS_ALLOC_USERDATA_ZERO                (1 << 2)/* zero extent on allocation */
-#define XFS_ALLOC_NOBUSY               (1 << 3)/* Busy extents not allowed */
+#define XFS_ALLOC_INITIAL_USER_DATA    (1 << 0)/* special case start of file */
+#define XFS_ALLOC_USERDATA_ZERO                (1 << 1)/* zero extent on allocation */
+#define XFS_ALLOC_NOBUSY               (1 << 2)/* Busy extents not allowed */

 
 static inline bool
 xfs_alloc_is_userdata(int datatype)
 
 static inline bool
 xfs_alloc_is_userdata(int datatype)

diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
index 05aedf4a538c573cc6db9bebda6dbcc324d4eb73..6d97794c97c047a66f4fc7240b5e47a40e926216 100644 (file)
--- a/fs/xfs/libxfs/xfs_bmap.c
+++ b/fs/xfs/libxfs/xfs_bmap.c
@@ -4042,12 +4042,8 @@ xfs_bmapi_allocate(
         */
        if (!(bma->flags & XFS_BMAPI_METADATA)) {
                bma->datatype = XFS_ALLOC_NOBUSY;
         */
        if (!(bma->flags & XFS_BMAPI_METADATA)) {
                bma->datatype = XFS_ALLOC_NOBUSY;

-               if (whichfork == XFS_DATA_FORK) {
-                       if (bma->offset == 0)
-                               bma->datatype |= XFS_ALLOC_INITIAL_USER_DATA;
-                       else
-                               bma->datatype |= XFS_ALLOC_USERDATA;
-               }
+               if (whichfork == XFS_DATA_FORK && bma->offset == 0)
+                       bma->datatype |= XFS_ALLOC_INITIAL_USER_DATA;

                if (bma->flags & XFS_BMAPI_ZERO)
                        bma->datatype |= XFS_ALLOC_USERDATA_ZERO;
        }
                if (bma->flags & XFS_BMAPI_ZERO)
                        bma->datatype |= XFS_ALLOC_USERDATA_ZERO;
        }