diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2014-02-20 11:55:12 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2014-02-20 11:55:12 +0100 |
| commit | bf5f48339a019c9b4b42284c3f45d58942cbda27 (patch) | |
| tree | 79976135166ffbdaf4ccb91bcadb17ddb551f060 /fs/ext3/inode.c | |
| parent | mac80211: remove erroneous comment about RX radiotap header (diff) | |
| parent | Staging: rtl8812ae: remove modules field of rate_control_ops (diff) | |
| download | linux-bf5f48339a019c9b4b42284c3f45d58942cbda27.tar.xz linux-bf5f48339a019c9b4b42284c3f45d58942cbda27.zip | |
Merge remote-tracking branch 'wireless-next/master' into mac80211-next
Diffstat (limited to 'fs/ext3/inode.c')
| -rw-r--r-- | fs/ext3/inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext3/inode.c b/fs/ext3/inode.c index 2bd85486b879..384b6ebb655f 100644 --- a/fs/ext3/inode.c +++ b/fs/ext3/inode.c @@ -3365,7 +3365,7 @@ int ext3_setattr(struct dentry *dentry, struct iattr *attr) mark_inode_dirty(inode); if (ia_valid & ATTR_MODE) - rc = ext3_acl_chmod(inode); + rc = posix_acl_chmod(inode, inode->i_mode); err_out: ext3_std_error(inode->i_sb, error); |