X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=fs%2Fattr.c;h=04f5d0b19914520c43d5ceac4be3641d0c210ab9;hb=refs%2Fheads%2Fvserver;hp=3317d4fe522014a6908d27211aeec8feda86501e;hpb=f7f1b0f1e2fbadeab12d24236000e778aa9b1ead;p=linux-2.6.git

diff --git a/fs/attr.c b/fs/attr.c
index 3317d4fe5..04f5d0b19 100644
--- a/fs/attr.c
+++ b/fs/attr.c
@@ -10,14 +10,14 @@
 #include <linux/mm.h>
 #include <linux/string.h>
 #include <linux/smp_lock.h>
-#include <linux/dnotify.h>
+#include <linux/capability.h>
+#include <linux/fsnotify.h>
 #include <linux/fcntl.h>
 #include <linux/quotaops.h>
 #include <linux/security.h>
-#include <linux/time.h>
 #include <linux/proc_fs.h>
 #include <linux/devpts_fs.h>
-#include <linux/vserver/debug.h>
+#include <linux/vs_base.h>
 
 /* Taken over from the old code... */
 
@@ -61,7 +61,7 @@ int inode_change_ok(struct inode *inode, struct iattr *attr)
 	}
 
 	/* Check for evil vserver activity */
-	if (vx_check(0, VX_ADMIN))
+	if (vx_check(0, VS_ADMIN))
 		goto fine;
 
 	if (IS_BARRIER(inode)) {
@@ -71,11 +71,13 @@ int inode_change_ok(struct inode *inode, struct iattr *attr)
 	}
 	switch (inode->i_sb->s_magic) {
 		case PROC_SUPER_MAGIC:
+			/* maybe allow that in the future? */
 			vxwprintk(1, "xid=%d messing with the procfs.",
 				vx_current_xid());
 			goto error;
 		case DEVPTS_SUPER_MAGIC:
-			if (vx_check(inode->i_xid, VX_IDENT))
+			/* devpts is xid tagged */
+			if (vx_check((xid_t)inode->i_tag, VS_IDENT))
 				goto fine;
 			vxwprintk(1, "xid=%d messing with the devpts.",
 				vx_current_xid());
@@ -89,49 +91,23 @@ error:
 
 EXPORT_SYMBOL(inode_change_ok);
 
-int inode_setattr_flags(struct inode *inode, unsigned int flags)
-{
-	unsigned int oldflags, newflags;
-
-	oldflags = inode->i_flags;
-	newflags = oldflags & ~(S_IMMUTABLE | S_IUNLINK | S_BARRIER);
-	if (flags & ATTR_FLAG_IMMUTABLE)
-		newflags |= S_IMMUTABLE;
-	if (flags & ATTR_FLAG_IUNLINK)
-		newflags |= S_IUNLINK;
-	if (flags & ATTR_FLAG_BARRIER)
-		newflags |= S_BARRIER;
-
-	if (oldflags ^ newflags)
-		inode->i_flags = newflags;
-	return 0;
-}
-
 int inode_setattr(struct inode * inode, struct iattr * attr)
 {
 	unsigned int ia_valid = attr->ia_valid;
-	int error = 0;
 
-	if (ia_valid & ATTR_SIZE) {
-		if (attr->ia_size != i_size_read(inode)) {
-			error = vmtruncate(inode, attr->ia_size);
-			if (error || (ia_valid == ATTR_SIZE))
-				goto out;
-		} else {
-			/*
-			 * We skipped the truncate but must still update
-			 * timestamps
-			 */
-			ia_valid |= ATTR_MTIME|ATTR_CTIME;
-		}
+	if (ia_valid & ATTR_SIZE &&
+	    attr->ia_size != i_size_read(inode)) {
+		int error = vmtruncate(inode, attr->ia_size);
+		if (error)
+			return error;
 	}
 
 	if (ia_valid & ATTR_UID)
 		inode->i_uid = attr->ia_uid;
 	if (ia_valid & ATTR_GID)
 		inode->i_gid = attr->ia_gid;
-	if (ia_valid & ATTR_XID)
-		inode->i_xid = attr->ia_xid;
+	if ((ia_valid & ATTR_TAG) && IS_TAGGED(inode))
+		inode->i_tag = attr->ia_tag;
 	if (ia_valid & ATTR_ATIME)
 		inode->i_atime = timespec_trunc(attr->ia_atime,
 						inode->i_sb->s_time_gran);
@@ -148,38 +124,11 @@ int inode_setattr(struct inode * inode, struct iattr * attr)
 			mode &= ~S_ISGID;
 		inode->i_mode = mode;
 	}
-	if (ia_valid & ATTR_ATTR_FLAG)
-		inode_setattr_flags(inode, attr->ia_attr_flags);
 	mark_inode_dirty(inode);
-out:
-	return error;
-}
-
-EXPORT_SYMBOL(inode_setattr);
-
-int setattr_mask(unsigned int ia_valid)
-{
-	unsigned long dn_mask = 0;
 
-	if (ia_valid & ATTR_UID)
-		dn_mask |= DN_ATTRIB;
-	if (ia_valid & ATTR_GID)
-		dn_mask |= DN_ATTRIB;
-	if (ia_valid & ATTR_XID)
-		dn_mask |= DN_ATTRIB;
-	if (ia_valid & ATTR_SIZE)
-		dn_mask |= DN_MODIFY;
-	/* both times implies a utime(s) call */
-	if ((ia_valid & (ATTR_ATIME|ATTR_MTIME)) == (ATTR_ATIME|ATTR_MTIME))
-		dn_mask |= DN_ATTRIB;
-	else if (ia_valid & ATTR_ATIME)
-		dn_mask |= DN_ACCESS;
-	else if (ia_valid & ATTR_MTIME)
-		dn_mask |= DN_MODIFY;
-	if (ia_valid & ATTR_MODE)
-		dn_mask |= DN_ATTRIB;
-	return dn_mask;
+	return 0;
 }
+EXPORT_SYMBOL(inode_setattr);
 
 int notify_change(struct dentry * dentry, struct iattr * attr)
 {
@@ -189,9 +138,6 @@ int notify_change(struct dentry * dentry, struct iattr * attr)
 	struct timespec now;
 	unsigned int ia_valid = attr->ia_valid;
 
-	if (!inode)
-		BUG();
-
 	mode = inode->i_mode;
 	now = current_fs_time(inode->i_sb);
 
@@ -237,7 +183,7 @@ int notify_change(struct dentry * dentry, struct iattr * attr)
 		if (!error) {
 			if ((ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) ||
 			    (ia_valid & ATTR_GID && attr->ia_gid != inode->i_gid) ||
-			    (ia_valid & ATTR_XID && attr->ia_xid != inode->i_xid))
+			    (ia_valid & ATTR_TAG && attr->ia_tag != inode->i_tag))
 				error = DQUOT_TRANSFER(inode, attr) ? -EDQUOT : 0;
 			if (!error)
 				error = inode_setattr(inode, attr);
@@ -247,11 +193,9 @@ int notify_change(struct dentry * dentry, struct iattr * attr)
 	if (ia_valid & ATTR_SIZE)
 		up_write(&dentry->d_inode->i_alloc_sem);
 
-	if (!error) {
-		unsigned long dn_mask = setattr_mask(ia_valid);
-		if (dn_mask)
-			dnotify_parent(dentry, dn_mask);
-	}
+	if (!error)
+		fsnotify_change(dentry, ia_valid);
+
 	return error;
 }