All of lore.kernel.org
 help / color / mirror / Atom feed
From: Iustin Pop <iusty@k1024.org>
To: xfs@oss.sgi.com
Cc: hch@infradead.org, Iustin Pop <iusty@k1024.org>
Subject: [PATCH] xfs: fix behaviour of XFS_IOC_FSSETXATTR on directories
Date: Wed, 27 Aug 2014 21:22:53 -0700	[thread overview]
Message-ID: <1409199773-16802-1-git-send-email-iusty@k1024.org> (raw)
In-Reply-To: <20140718191314.GB27801@teal.hq.k1024.org>

Currently, the ioctl handling code for XFS_IOC_FSSETXATTR treats all
targets as regular files: it refuses to change the extent size if
extents are allocated. This is wrong for directories, as there the
extent size is only used as a default for children.

The patch fixes this by only checking for allocated extents for regular
files; it leaves undefined what it means to set an extent size on a
non-regular, non-directory inode. Additionally, when setting a non-zero
extent size, the appropriate flags (EXTSIZE, respectively EXTSZINHERIT)
are enforced for regular files and directories.

Signed-off-by: Iustin Pop <iusty@k1024.org>
---
 A patch against xfstests to test for the fixed behaviour will follow
 shortly.

 fs/xfs/xfs_ioctl.c | 34 ++++++++++++++++++++++++++--------
 1 file changed, 26 insertions(+), 8 deletions(-)

diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
index 8bc1bbc..5b9acd2 100644
--- a/fs/xfs/xfs_ioctl.c
+++ b/fs/xfs/xfs_ioctl.c
@@ -1116,14 +1116,32 @@ xfs_ioctl_setattr(
 	}
 
 	if (mask & FSX_EXTSIZE) {
-		/*
-		 * Can't change extent size if any extents are allocated.
-		 */
-		if (ip->i_d.di_nextents &&
-		    ((ip->i_d.di_extsize << mp->m_sb.sb_blocklog) !=
-		     fa->fsx_extsize)) {
-			code = XFS_ERROR(EINVAL);	/* EFBIG? */
-			goto error_return;
+		if (S_ISDIR(ip->i_d.di_mode)) {
+			/*
+			 * Enforce setting the EXTSZINHERIT flag when
+			 * a non-zero extent size has been specified.
+			 */
+			if (fa->fsx_extsize) {
+				fa->fsx_xflags |= XFS_XFLAG_EXTSZINHERIT;
+			}
+		} else if (S_ISREG(ip->i_d.di_mode)) {
+			/*
+			 * For a regular file, we can't change extent
+			 * size if any extents are allocated.
+			 */
+			if (ip->i_d.di_nextents &&
+			    ((ip->i_d.di_extsize << mp->m_sb.sb_blocklog) !=
+			     fa->fsx_extsize)) {
+				code = XFS_ERROR(EINVAL);	/* EFBIG? */
+				goto error_return;
+			}
+			/*
+			 * Enforce setting the EXTSIZE flag when
+			 * a non-zero extent size has been specified.
+			 */
+			if (fa->fsx_extsize) {
+				fa->fsx_xflags |= XFS_XFLAG_EXTSIZE;
+			}
 		}
 
 		/*
-- 
2.1.0

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

  reply	other threads:[~2014-08-28  4:23 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-07-14  7:09 Error setting extent size on a directory Iustin Pop
2014-07-17  9:04 ` Christoph Hellwig
2014-07-18 19:13   ` Iustin Pop
2014-08-28  4:22     ` Iustin Pop [this message]
2014-08-28  9:31       ` [PATCH] xfs: fix behaviour of XFS_IOC_FSSETXATTR on directories Dave Chinner
2014-08-28 22:34         ` Iustin Pop
2014-08-29  0:46           ` Dave Chinner
2014-12-04  4:14             ` Iustin Pop
2014-12-05  0:11               ` Dave Chinner
2014-12-05  5:49                 ` Iustin Pop
2014-08-28  4:24     ` [PATCH xfstests] xfs: add tests for XFS_IOC_FSSETXATTR behaviour Iustin Pop
2014-08-28 10:16       ` Dave Chinner
2014-08-28 10:16         ` Dave Chinner
2014-08-28 22:28         ` Iustin Pop
2014-08-28 22:28           ` Iustin Pop
2014-08-29  2:52           ` Dave Chinner
2014-08-29  2:52             ` Dave Chinner
2014-12-04  4:20             ` [PATCH] xfs: add test " Iustin Pop
2014-12-04  4:20               ` Iustin Pop

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1409199773-16802-1-git-send-email-iusty@k1024.org \
    --to=iusty@k1024.org \
    --cc=hch@infradead.org \
    --cc=xfs@oss.sgi.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.