diff options
Diffstat (limited to 'fs/jfs/acl.c')
| -rw-r--r-- | fs/jfs/acl.c | 26 | 
1 files changed, 1 insertions, 25 deletions
diff --git a/fs/jfs/acl.c b/fs/jfs/acl.c index d66477c3430..213169780b6 100644 --- a/fs/jfs/acl.c +++ b/fs/jfs/acl.c @@ -20,7 +20,6 @@  #include <linux/sched.h>  #include <linux/fs.h> -#include <linux/quotaops.h>  #include <linux/posix_acl_xattr.h>  #include "jfs_incore.h"  #include "jfs_txnmgr.h" @@ -174,7 +173,7 @@ cleanup:  	return rc;  } -static int jfs_acl_chmod(struct inode *inode) +int jfs_acl_chmod(struct inode *inode)  {  	struct posix_acl *acl, *clone;  	int rc; @@ -205,26 +204,3 @@ static int jfs_acl_chmod(struct inode *inode)  	posix_acl_release(clone);  	return rc;  } - -int jfs_setattr(struct dentry *dentry, struct iattr *iattr) -{ -	struct inode *inode = dentry->d_inode; -	int rc; - -	rc = inode_change_ok(inode, iattr); -	if (rc) -		return rc; - -	if ((iattr->ia_valid & ATTR_UID && iattr->ia_uid != inode->i_uid) || -	    (iattr->ia_valid & ATTR_GID && iattr->ia_gid != inode->i_gid)) { -		if (vfs_dq_transfer(inode, iattr)) -			return -EDQUOT; -	} - -	rc = inode_setattr(inode, iattr); - -	if (!rc && (iattr->ia_valid & ATTR_MODE)) -		rc = jfs_acl_chmod(inode); - -	return rc; -}  |