X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=fs%2Fjfs%2Facl.c;h=4d84bdc882999150a1e9bd7ae829f1aff24b33f2;hb=9cdd79c9b99873d600d397fda012fc3f57cc2776;hp=e2281300979c7b2c5e09287e28364bb25733c648;hpb=ac58c9059da8886b5e8cde012a80266b18ca146e;p=linux-2.6-omap-h63xx.git diff --git a/fs/jfs/acl.c b/fs/jfs/acl.c index e2281300979..4d84bdc8829 100644 --- a/fs/jfs/acl.c +++ b/fs/jfs/acl.c @@ -5,16 +5,16 @@ * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See * the GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ @@ -183,7 +183,7 @@ cleanup: posix_acl_release(acl); } else inode->i_mode &= ~current->fs->umask; - + JFS_IP(inode)->mode2 = (JFS_IP(inode)->mode2 & 0xffff0000) | inode->i_mode;