diff options
author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2016-10-20 00:10:27 -0300 |
---|---|---|
committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2016-10-20 00:10:27 -0300 |
commit | d0b2f91bede3bd5e3d24dd6803e56eee959c1797 (patch) | |
tree | 7fee4ab0509879c373c4f2cbd5b8a5be5b4041ee /fs/aufs | |
parent | e914f8eb445e8f74b00303c19c2ffceaedd16a05 (diff) |
Linux-libre 4.8.2-gnupck-4.8.2-gnu
Diffstat (limited to 'fs/aufs')
-rw-r--r-- | fs/aufs/cpup.c | 14 | ||||
-rw-r--r-- | fs/aufs/dynop.c | 2 | ||||
-rw-r--r-- | fs/aufs/file.c | 6 | ||||
-rw-r--r-- | fs/aufs/i_op.c | 13 |
4 files changed, 27 insertions, 8 deletions
diff --git a/fs/aufs/cpup.c b/fs/aufs/cpup.c index 484cdc3ee..598a4d6c3 100644 --- a/fs/aufs/cpup.c +++ b/fs/aufs/cpup.c @@ -381,6 +381,7 @@ static int au_cp_regular(struct au_cp_generic *cpg) } }; struct super_block *sb; + struct inode *h_src_inode; struct task_struct *tsk = current; /* bsrc branch can be ro/rw. */ @@ -396,7 +397,9 @@ static int au_cp_regular(struct au_cp_generic *cpg) } /* try stopping to update while we copyup */ - IMustLock(d_inode(file[SRC].dentry)); + h_src_inode = d_inode(file[SRC].dentry); + if (!au_test_nfs(h_src_inode->i_sb)) + IMustLock(h_src_inode); err = au_copy_file(file[DST].file, file[SRC].file, cpg->len); /* i wonder if we had O_NO_DELAY_FPUT flag */ @@ -456,8 +459,13 @@ static int au_do_cpup_regular(struct au_cp_generic *cpg, goto out; } h_src_attr->valid = 1; - err = au_cp_regular(cpg); - inode_unlock(h_src_inode); + if (!au_test_nfs(h_src_inode->i_sb)) { + err = au_cp_regular(cpg); + inode_unlock(h_src_inode); + } else { + inode_unlock(h_src_inode); + err = au_cp_regular(cpg); + } rerr = au_pin_hdir_relock(cpg->pin); if (!err && rerr) err = rerr; diff --git a/fs/aufs/dynop.c b/fs/aufs/dynop.c index 1deb54077..eb0e1a73f 100644 --- a/fs/aufs/dynop.c +++ b/fs/aufs/dynop.c @@ -176,6 +176,8 @@ static void dy_aop(struct au_dykey *key, const void *h_op, /* this one will be changed according to an aufs mount option */ DySetAop(direct_IO); DySetAop(migratepage); + DySetAop(isolate_page); + DySetAop(putback_page); DySetAop(launder_page); DySetAop(is_partially_uptodate); DySetAop(is_dirty_writeback); diff --git a/fs/aufs/file.c b/fs/aufs/file.c index 8d5ca6f7f..bfc1d1b0b 100644 --- a/fs/aufs/file.c +++ b/fs/aufs/file.c @@ -794,6 +794,10 @@ static int aufs_migratepage(struct address_space *mapping, struct page *newpage, struct page *page, enum migrate_mode mode) { AuUnsupport(); return 0; } #endif +static bool aufs_isolate_page(struct page *page, isolate_mode_t mode) +{ AuUnsupport(); return true; } +static void aufs_putback_page(struct page *page) +{ AuUnsupport(); } static int aufs_launder_page(struct page *page) { AuUnsupport(); return 0; } static int aufs_is_partially_uptodate(struct page *page, @@ -828,6 +832,8 @@ const struct address_space_operations aufs_aop = { .releasepage = aufs_releasepage, /* is fallback_migrate_page ok? */ /* .migratepage = aufs_migratepage, */ + .isolate_page = aufs_isolate_page, + .putback_page = aufs_putback_page, .launder_page = aufs_launder_page, .is_partially_uptodate = aufs_is_partially_uptodate, .is_dirty_writeback = aufs_is_dirty_writeback, diff --git a/fs/aufs/i_op.c b/fs/aufs/i_op.c index 7b515db87..c730ec71f 100644 --- a/fs/aufs/i_op.c +++ b/fs/aufs/i_op.c @@ -18,12 +18,15 @@ static int h_permission(struct inode *h_inode, int mask, int err; const unsigned char write_mask = !!(mask & (MAY_WRITE | MAY_APPEND)); + err = -EPERM; + if (write_mask && IS_IMMUTABLE(h_inode)) + goto out; + err = -EACCES; - if ((write_mask && IS_IMMUTABLE(h_inode)) - || ((mask & MAY_EXEC) - && S_ISREG(h_inode->i_mode) - && (path_noexec(h_path) - || !(h_inode->i_mode & S_IXUGO)))) + if (((mask & MAY_EXEC) + && S_ISREG(h_inode->i_mode) + && (path_noexec(h_path) + || !(h_inode->i_mode & S_IXUGO)))) goto out; /* |