xfs
[Top] [All Lists]

Re: [PATCH] kill BMAPI_UNWRITTEN

To: "Christoph Hellwig" <hch@xxxxxx>
Subject: Re: [PATCH] kill BMAPI_UNWRITTEN
From: "Bhagi rathi" <jahnu77@xxxxxxxxx>
Date: Mon, 10 Sep 2007 01:04:55 +0530
Cc: xfs@xxxxxxxxxxx
Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=beta; h=domainkey-signature:received:received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:references; bh=rLzUbQfaoSZH7QAJQwJUh78qiYuow6TlhJal1Goyobc=; b=SHoAj0xqCJ7MneiFp8qAR2MdLnxPL3RP/ZXbjvJq/bw9qHN0mb0tnbsAYURroXyUzjhKyBcxqh0sFOxr22c6e1DMkHaQRk0ZqnmMFNfTetye1dFacJUVnPl6MZIh9ePTdHlgPcRYwVlNFm8lvLtgKs5XfBzfozVRTCAc7+SWLGc=
Domainkey-signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta; h=received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:references; b=VDFSMerX3OYRpZtgswiw91fg0fZITtYuIwC4zBWR3E2vsdnMfqbx+JcfQK5S+18lQp4wndT7Knlt+rJ5u0v6Re48VI2323OEg1v8GKogtZ2RQbQK3R4ttUr1lQeefST8LEpbRWt5iyxE3qIOkFcLOeZEhYqd5iE1M1eWN3358PE=
In-reply-to: <20070909154103.GB19986@lst.de>
References: <20070909154103.GB19986@lst.de>
Sender: xfs-bounce@xxxxxxxxxxx
The reason for eliminating BMAPI_UNWRITTEN is not clear. It is ideal to keep
all the block map
interfaces and information to go through xfs_iomap, xfs_bmapi functionality.

 Thanks,
-Saradhi.

On 9/9/07, Christoph Hellwig <hch@xxxxxx> wrote:
>
> There is no reason to go through xfs_iomap for the BMAPI_UNWRITTEN
> because it has nothing in common with the other cases.  Instead
> check for the shutdown filesystem in xfs_end_bio_unwritten and perform
> a direct call to xfs_iomap_write_unwritten (which should be renamed
> to something more sensible one day)
>
>
> Signed-off-by: Christoph Hellwig <hch@xxxxxx>
>
> Index: linux-2.6-xfs/fs/xfs/linux-2.6/xfs_aops.c
> ===================================================================
> --- linux-2.6-xfs.orig/fs/xfs/linux-2.6/xfs_aops.c      2007-09-06 10:18:
> 05.000000000 +0200
> +++ linux-2.6-xfs/fs/xfs/linux-2.6/xfs_aops.c   2007-09-06 10:18:
> 05.000000000 +0200
> @@ -237,12 +237,13 @@ xfs_end_bio_unwritten(
> {
>         xfs_ioend_t             *ioend =
>                 container_of(work, xfs_ioend_t, io_work);
> +       struct xfs_inode        *ip = XFS_I(ioend->io_inode);
>         xfs_off_t               offset = ioend->io_offset;
>         size_t                  size = ioend->io_size;
>
>         if (likely(!ioend->io_error)) {
> -               xfs_bmap(XFS_I(ioend->io_inode), offset, size,
> -                               BMAPI_UNWRITTEN, NULL, NULL);
> +               if (!XFS_FORCED_SHUTDOWN(ip->i_mount))
> +                       xfs_iomap_write_unwritten(ip, offset, size);
>                 xfs_setfilesize(ioend);
>         }
>         xfs_destroy_ioend(ioend);
> Index: linux-2.6-xfs/fs/xfs/xfs_iomap.c
> ===================================================================
> --- linux-2.6-xfs.orig/fs/xfs/xfs_iomap.c       2007-09-06 10:18:
> 05.000000000 +0200
> +++ linux-2.6-xfs/fs/xfs/xfs_iomap.c    2007-09-06 10:18:05.000000000+0200
> @@ -191,9 +191,7 @@ xfs_iomap(
>         if (XFS_FORCED_SHUTDOWN(mp))
>                 return XFS_ERROR(EIO);
>
> -       switch (flags &
> -               (BMAPI_READ | BMAPI_WRITE | BMAPI_ALLOCATE |
> -                BMAPI_UNWRITTEN)) {
> +       switch (flags & (BMAPI_READ | BMAPI_WRITE | BMAPI_ALLOCATE)) {
>         case BMAPI_READ:
>                 xfs_iomap_enter_trace(XFS_IOMAP_READ_ENTER, io, offset,
> count);
>                 lockmode = XFS_LCK_MAP_SHARED(mp, io);
> @@ -218,8 +216,6 @@ xfs_iomap(
>                         XFS_ILOCK(mp, io, lockmode);
>                 }
>                 break;
> -       case BMAPI_UNWRITTEN:
> -               goto phase2;
>         default:
>                 BUG();
>         }
> @@ -238,8 +234,7 @@ xfs_iomap(
>         if (error)
>                 goto out;
>
> -phase2:
> -       switch (flags & (BMAPI_WRITE|BMAPI_ALLOCATE|BMAPI_UNWRITTEN)) {
> +       switch (flags & (BMAPI_WRITE|BMAPI_ALLOCATE)) {
>         case BMAPI_WRITE:
>                 /* If we found an extent, return it */
>                 if (nimaps &&
> @@ -277,11 +272,6 @@ phase2:
>                 error = XFS_IOMAP_WRITE_ALLOCATE(mp, io, offset, count,
>                                                  &imap, &nimaps);
>                 break;
> -       case BMAPI_UNWRITTEN:
> -               lockmode = 0;
> -               error = XFS_IOMAP_WRITE_UNWRITTEN(mp, io, offset, count);
> -               nimaps = 0;
> -               break;
>         }
>
>         if (nimaps) {
> Index: linux-2.6-xfs/fs/xfs/xfs_iomap.h
> ===================================================================
> --- linux-2.6-xfs.orig/fs/xfs/xfs_iomap.h       2007-09-06 10:18:
> 05.000000000 +0200
> +++ linux-2.6-xfs/fs/xfs/xfs_iomap.h    2007-09-06 10:18:05.000000000+0200
> @@ -36,7 +36,6 @@ typedef enum {
>         BMAPI_READ = (1 << 0),          /* read extents */
>         BMAPI_WRITE = (1 << 1),         /* create extents */
>         BMAPI_ALLOCATE = (1 << 2),      /* delayed allocate to real
> extents */
> -       BMAPI_UNWRITTEN  = (1 << 3),    /* unwritten extents to real
> extents */
>         /* modifiers */
>         BMAPI_IGNSTATE = (1 << 4),      /* ignore unwritten state on read
> */
>         BMAPI_DIRECT = (1 << 5),        /* direct instead of buffered
> write */
>
>
>


[[HTML alternate version deleted]]


<Prev in Thread] Current Thread [Next in Thread>