From: Miklos Szeredi Introduce path_setattr(). Stop exporting notify_change() to modules. Signed-off-by: Miklos Szeredi --- fs/attr.c | 14 +++++++++++++- fs/ecryptfs/inode.c | 11 ++++++----- fs/nfsd/vfs.c | 17 +++++++++++------ fs/open.c | 52 ++++++++++------------------------------------------ include/linux/fs.h | 1 + 5 files changed, 41 insertions(+), 54 deletions(-) Index: linux-2.6/fs/attr.c =================================================================== --- linux-2.6.orig/fs/attr.c 2008-07-23 00:10:12.000000000 +0200 +++ linux-2.6/fs/attr.c 2008-07-23 00:10:26.000000000 +0200 @@ -14,6 +14,7 @@ #include #include #include +#include /* Taken over from the old code... */ @@ -188,4 +189,15 @@ int notify_change(struct dentry * dentry return error; } -EXPORT_SYMBOL(notify_change); +int path_setattr(struct path *path, struct iattr *attr) +{ + int error = mnt_want_write(path->mnt); + + if (!error) { + error = notify_change(path->dentry, attr); + mnt_drop_write(path->mnt); + } + + return error; +} +EXPORT_SYMBOL(path_setattr); Index: linux-2.6/fs/ecryptfs/inode.c =================================================================== --- linux-2.6.orig/fs/ecryptfs/inode.c 2008-07-23 00:10:26.000000000 +0200 +++ linux-2.6/fs/ecryptfs/inode.c 2008-07-23 00:10:26.000000000 +0200 @@ -828,7 +828,7 @@ ecryptfs_permission(struct inode *inode, static int ecryptfs_setattr(struct dentry *dentry, struct iattr *ia) { int rc = 0; - struct dentry *lower_dentry; + struct path lower_path; struct inode *inode; struct inode *lower_inode; struct ecryptfs_crypt_stat *crypt_stat; @@ -838,7 +838,8 @@ static int ecryptfs_setattr(struct dentr ecryptfs_init_crypt_stat(crypt_stat); inode = dentry->d_inode; lower_inode = ecryptfs_inode_to_lower(inode); - lower_dentry = ecryptfs_dentry_to_lower(dentry); + lower_path.mnt = ecryptfs_dentry_to_lower_mnt(dentry); + lower_path.dentry = ecryptfs_dentry_to_lower(dentry); mutex_lock(&crypt_stat->cs_mutex); if (S_ISDIR(dentry->d_inode->i_mode)) crypt_stat->flags &= ~(ECRYPTFS_ENCRYPTED); @@ -889,9 +890,9 @@ static int ecryptfs_setattr(struct dentr if (ia->ia_valid & (ATTR_KILL_SUID | ATTR_KILL_SGID)) ia->ia_valid &= ~ATTR_MODE; - mutex_lock(&lower_dentry->d_inode->i_mutex); - rc = notify_change(lower_dentry, ia); - mutex_unlock(&lower_dentry->d_inode->i_mutex); + mutex_lock(&lower_path.dentry->d_inode->i_mutex); + rc = path_setattr(&lower_path, ia); + mutex_unlock(&lower_path.dentry->d_inode->i_mutex); out: fsstack_copy_attr_all(inode, lower_inode, NULL); return rc; Index: linux-2.6/fs/nfsd/vfs.c =================================================================== --- linux-2.6.orig/fs/nfsd/vfs.c 2008-07-23 00:10:26.000000000 +0200 +++ linux-2.6/fs/nfsd/vfs.c 2008-07-23 00:10:26.000000000 +0200 @@ -393,8 +393,11 @@ nfsd_setattr(struct svc_rqst *rqstp, str err = nfserr_notsync; if (!check_guard || guardtime == inode->i_ctime.tv_sec) { + struct path path; + fh_lock(fhp); - host_err = notify_change(dentry, iap); + fh_to_path(fhp, &path); + host_err = path_setattr(&path, iap); err = nfserrno(host_err); fh_unlock(fhp); } @@ -950,14 +953,16 @@ out: return err; } -static void kill_suid(struct dentry *dentry) +static void kill_suid(struct svc_fh *fhp) { + struct path path; struct iattr ia; ia.ia_valid = ATTR_KILL_SUID | ATTR_KILL_SGID | ATTR_KILL_PRIV; - mutex_lock(&dentry->d_inode->i_mutex); - notify_change(dentry, &ia); - mutex_unlock(&dentry->d_inode->i_mutex); + mutex_lock(&path.dentry->d_inode->i_mutex); + fh_to_path(fhp, &path); + path_setattr(&path, &ia); + mutex_unlock(&path.dentry->d_inode->i_mutex); } static __be32 @@ -1015,7 +1020,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, s /* clear setuid/setgid flag after write */ if (host_err >= 0 && (inode->i_mode & (S_ISUID | S_ISGID))) - kill_suid(dentry); + kill_suid(fhp); if (host_err >= 0 && stable) { static ino_t last_ino; Index: linux-2.6/fs/open.c =================================================================== --- linux-2.6.orig/fs/open.c 2008-07-23 00:10:12.000000000 +0200 +++ linux-2.6/fs/open.c 2008-07-23 00:10:26.000000000 +0200 @@ -596,18 +596,13 @@ asmlinkage long sys_fchmod(unsigned int audit_inode(NULL, dentry); - err = mnt_want_write(file->f_path.mnt); - if (err) - goto out_putf; mutex_lock(&inode->i_mutex); if (mode == (mode_t) -1) mode = inode->i_mode; newattrs.ia_mode = (mode & S_IALLUGO) | (inode->i_mode & ~S_IALLUGO); newattrs.ia_valid = ATTR_MODE | ATTR_CTIME; - err = notify_change(dentry, &newattrs); + err = path_setattr(&file->f_path, &newattrs); mutex_unlock(&inode->i_mutex); - mnt_drop_write(file->f_path.mnt); -out_putf: fput(file); out: return err; @@ -626,18 +621,13 @@ asmlinkage long sys_fchmodat(int dfd, co goto out; inode = path.dentry->d_inode; - error = mnt_want_write(path.mnt); - if (error) - goto dput_and_out; mutex_lock(&inode->i_mutex); if (mode == (mode_t) -1) mode = inode->i_mode; newattrs.ia_mode = (mode & S_IALLUGO) | (inode->i_mode & ~S_IALLUGO); newattrs.ia_valid = ATTR_MODE | ATTR_CTIME; - error = notify_change(path.dentry, &newattrs); + error = path_setattr(&path, &newattrs); mutex_unlock(&inode->i_mutex); - mnt_drop_write(path.mnt); -dput_and_out: path_put(&path); out: return error; @@ -648,9 +638,9 @@ asmlinkage long sys_chmod(const char __u return sys_fchmodat(AT_FDCWD, filename, mode); } -static int chown_common(struct dentry * dentry, uid_t user, gid_t group) +static int chown_common(struct path *path, uid_t user, gid_t group) { - struct inode *inode = dentry->d_inode; + struct inode *inode = path->dentry->d_inode; int error; struct iattr newattrs; @@ -667,7 +657,7 @@ static int chown_common(struct dentry * newattrs.ia_valid |= ATTR_KILL_SUID | ATTR_KILL_SGID | ATTR_KILL_PRIV; mutex_lock(&inode->i_mutex); - error = notify_change(dentry, &newattrs); + error = path_setattr(path, &newattrs); mutex_unlock(&inode->i_mutex); return error; @@ -681,12 +671,7 @@ asmlinkage long sys_chown(const char __u error = user_path(filename, &path); if (error) goto out; - error = mnt_want_write(path.mnt); - if (error) - goto out_release; - error = chown_common(path.dentry, user, group); - mnt_drop_write(path.mnt); -out_release: + error = chown_common(&path, user, group); path_put(&path); out: return error; @@ -706,12 +691,7 @@ asmlinkage long sys_fchownat(int dfd, co error = user_path_at(dfd, filename, follow, &path); if (error) goto out; - error = mnt_want_write(path.mnt); - if (error) - goto out_release; - error = chown_common(path.dentry, user, group); - mnt_drop_write(path.mnt); -out_release: + error = chown_common(&path, user, group); path_put(&path); out: return error; @@ -725,12 +705,7 @@ asmlinkage long sys_lchown(const char __ error = user_lpath(filename, &path); if (error) goto out; - error = mnt_want_write(path.mnt); - if (error) - goto out_release; - error = chown_common(path.dentry, user, group); - mnt_drop_write(path.mnt); -out_release: + error = chown_common(&path, user, group); path_put(&path); out: return error; @@ -741,20 +716,13 @@ asmlinkage long sys_fchown(unsigned int { struct file * file; int error = -EBADF; - struct dentry * dentry; file = fget(fd); if (!file) goto out; - error = mnt_want_write(file->f_path.mnt); - if (error) - goto out_fput; - dentry = file->f_path.dentry; - audit_inode(NULL, dentry); - error = chown_common(dentry, user, group); - mnt_drop_write(file->f_path.mnt); -out_fput: + audit_inode(NULL, file->f_path.dentry); + error = chown_common(&file->f_path, user, group); fput(file); out: return error; Index: linux-2.6/include/linux/fs.h =================================================================== --- linux-2.6.orig/include/linux/fs.h 2008-07-23 00:10:26.000000000 +0200 +++ linux-2.6/include/linux/fs.h 2008-07-23 00:10:26.000000000 +0200 @@ -1761,6 +1761,7 @@ extern int do_remount_sb(struct super_bl extern sector_t bmap(struct inode *, sector_t); #endif extern int notify_change(struct dentry *, struct iattr *); +extern int path_setattr(struct path *, struct iattr *); extern int inode_permission(struct inode *, int); extern int generic_permission(struct inode *, int, int (*check_acl)(struct inode *, int)); -- -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/